Merge "Performing consistent vibration effects when opening notifications" into pi-dev (b16aa93d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -95,6 +95,7 @@ import android.os.SystemProperties;
	import android.os.Trace;		import android.os.Trace;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
			import android.os.VibrationEffect;
	import android.os.Vibrator;		import android.os.Vibrator;
	import android.provider.Settings;		import android.provider.Settings;
	import android.service.notification.StatusBarNotification;		import android.service.notification.StatusBarNotification;
	@@ -209,6 +210,7 @@ import com.android.systemui.statusbar.RemoteInputController;
	import com.android.systemui.statusbar.ScrimView;		import com.android.systemui.statusbar.ScrimView;
	import com.android.systemui.statusbar.SignalClusterView;		import com.android.systemui.statusbar.SignalClusterView;
	import com.android.systemui.statusbar.StatusBarState;		import com.android.systemui.statusbar.StatusBarState;
			import com.android.systemui.statusbar.VibratorHelper;
	import com.android.systemui.statusbar.notification.AboveShelfObserver;		import com.android.systemui.statusbar.notification.AboveShelfObserver;
	import com.android.systemui.statusbar.notification.ActivityLaunchAnimator;		import com.android.systemui.statusbar.notification.ActivityLaunchAnimator;
	import com.android.systemui.statusbar.notification.VisualStabilityManager;		import com.android.systemui.statusbar.notification.VisualStabilityManager;
	@@ -604,6 +606,8 @@ public class StatusBar extends SystemUI implements DemoMode,
	private View mNavigationBarView;		private View mNavigationBarView;
	protected ActivityLaunchAnimator mActivityLaunchAnimator;		protected ActivityLaunchAnimator mActivityLaunchAnimator;
	private HeadsUpAppearanceController mHeadsUpAppearanceController;		private HeadsUpAppearanceController mHeadsUpAppearanceController;
			private boolean mVibrateOnOpening;
			private VibratorHelper mVibratorHelper;

	@Override		@Override
	public void start() {		public void start() {
	@@ -641,6 +645,9 @@ public class StatusBar extends SystemUI implements DemoMode,
	updateDisplaySize();		updateDisplaySize();

	Resources res = mContext.getResources();		Resources res = mContext.getResources();
			mVibrateOnOpening = mContext.getResources().getBoolean(
			R.bool.config_vibrateOnIconAnimation);
			mVibratorHelper = Dependency.get(VibratorHelper.class);
	mScrimSrcModeEnabled = res.getBoolean(R.bool.config_status_bar_scrim_behind_use_src);		mScrimSrcModeEnabled = res.getBoolean(R.bool.config_status_bar_scrim_behind_use_src);
	mClearAllEnabled = res.getBoolean(R.bool.config_enableNotificationsClearAll);		mClearAllEnabled = res.getBoolean(R.bool.config_enableNotificationsClearAll);

	@@ -2157,6 +2164,9 @@ public class StatusBar extends SystemUI implements DemoMode,
	} else if (KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN == key) {		} else if (KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN == key) {
	mMetricsLogger.action(MetricsEvent.ACTION_SYSTEM_NAVIGATION_KEY_DOWN);		mMetricsLogger.action(MetricsEvent.ACTION_SYSTEM_NAVIGATION_KEY_DOWN);
	if (mNotificationPanel.isFullyCollapsed()) {		if (mNotificationPanel.isFullyCollapsed()) {
			if (mVibrateOnOpening) {
			mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);
			}
	mNotificationPanel.expand(true /* animate */);		mNotificationPanel.expand(true /* animate */);
	mMetricsLogger.count(NotificationPanelView.COUNTER_PANEL_OPEN, 1);		mMetricsLogger.count(NotificationPanelView.COUNTER_PANEL_OPEN, 1);
	} else if (!mNotificationPanel.isInSettings() && !mNotificationPanel.isExpanding()){		} else if (!mNotificationPanel.isInSettings() && !mNotificationPanel.isExpanding()){