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

am 9ff1510a: Fix vibration when expanding notifications

Browse Source 
* commit '9ff1510aeba910c22b2e31c29a93b08281feae4f':
  Fix vibration when expanding notifications
This commit is contained in:
Jorim Jaggi
2015-06-11 01:32:43 +00:00
committed by Android Git Automerger
parent 5c047963d9 9ff1510aeb
commit 8fd55d958d
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/config.xml
View File

@@ -135,8 +135,6 @@
<!-- The maximum number of items to be displayed in quick settings --> <!-- The maximum number of items to be displayed in quick settings -->
<integer name="quick_settings_detail_max_item_count">7</integer> <integer name="quick_settings_detail_max_item_count">7</integer>
<integer name="blinds_pop_duration_ms">10</integer>
<!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? --> <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->
<bool name="config_show4GForLTE">true</bool> <bool name="config_show4GForLTE">true</bool>

28
packages/SystemUI/src/com/android/systemui/ExpandHelper.java
View File

@@ -25,6 +25,7 @@ import android.media.AudioAttributes;
import android.os.Vibrator; import android.os.Vibrator;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.HapticFeedbackConstants;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector;
import android.view.ScaleGestureDetector.OnScaleGestureListener; import android.view.ScaleGestureDetector.OnScaleGestureListener;
@@ -64,15 +65,6 @@ public class ExpandHelper implements Gefingerpoken {
// 2f: maximum brightness is stretching a 1U to 3U, or a 4U to 6U // 2f: maximum brightness is stretching a 1U to 3U, or a 4U to 6U
private static final float STRETCH_INTERVAL = 2f; private static final float STRETCH_INTERVAL = 2f;
// level of glow for a touch, without overstretch
// overstretch fills the range (GLOW_BASE, 1.0]
private static final float GLOW_BASE = 0.5f;
private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
.build();
@SuppressWarnings("unused") @SuppressWarnings("unused")
private Context mContext; private Context mContext;
@@ -94,13 +86,11 @@ public class ExpandHelper implements Gefingerpoken {
private float mLastSpanY; private float mLastSpanY;
private int mTouchSlop; private int mTouchSlop;
private float mLastMotionY; private float mLastMotionY;
private int mPopDuration;
private float mPullGestureMinXSpan; private float mPullGestureMinXSpan;
private Callback mCallback; private Callback mCallback;
private ScaleGestureDetector mSGD; private ScaleGestureDetector mSGD;
private ViewScaler mScaler; private ViewScaler mScaler;
private ObjectAnimator mScaleAnimation; private ObjectAnimator mScaleAnimation;
private Vibrator mVibrator;
private boolean mEnabled = true; private boolean mEnabled = true;
private ExpandableView mResizedView; private ExpandableView mResizedView;
private float mCurrentHeight; private float mCurrentHeight;
@@ -174,7 +164,6 @@ public class ExpandHelper implements Gefingerpoken {
mScaler = new ViewScaler(); mScaler = new ViewScaler();
mGravity = Gravity.TOP; mGravity = Gravity.TOP;
mScaleAnimation = ObjectAnimator.ofFloat(mScaler, "height", 0f); mScaleAnimation = ObjectAnimator.ofFloat(mScaler, "height", 0f);
mPopDuration = mContext.getResources().getInteger(R.integer.blinds_pop_duration_ms);
mPullGestureMinXSpan = mContext.getResources().getDimension(R.dimen.pull_span_min); mPullGestureMinXSpan = mContext.getResources().getDimension(R.dimen.pull_span_min);
final ViewConfiguration configuration = ViewConfiguration.get(mContext); final ViewConfiguration configuration = ViewConfiguration.get(mContext);
@@ -452,7 +441,9 @@ public class ExpandHelper implements Gefingerpoken {
} }
if (!mHasPopped) { if (!mHasPopped) {
vibrate(mPopDuration); if (mEventSource != null) {
mEventSource.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
}
mHasPopped = true; mHasPopped = true;
} }
@@ -600,16 +591,5 @@ public class ExpandHelper implements Gefingerpoken {
public void onlyObserveMovements(boolean onlyMovements) { public void onlyObserveMovements(boolean onlyMovements) {
mOnlyMovements = onlyMovements; mOnlyMovements = onlyMovements;
} }
/**
* Triggers haptic feedback.
*/
private synchronized void vibrate(long duration) {
if (mVibrator == null) {
mVibrator = (android.os.Vibrator)
mContext.getSystemService(Context.VIBRATOR_SERVICE);
}
mVibrator.vibrate(duration, VIBRATION_ATTRIBUTES);
}
} }