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

Commit fa11a422 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Performing consistent vibration effects when opening notifications"... 

Merge "Performing consistent vibration effects when opening notifications" into pi-dev am: 62eb45f2
am: b16aa93d

Change-Id: If0f183b07baa3f0e06ae3fdfaedd403fdd5088d2
parents 4a504b15 b16aa93d

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

+10 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ import android.os.SystemProperties; 
import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.VibrationEffect;

import android.os.Vibrator;

import android.provider.Settings;

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.SignalClusterView;

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.ActivityLaunchAnimator;

import com.android.systemui.statusbar.notification.VisualStabilityManager;
@@ -604,6 +606,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private View mNavigationBarView;

    protected ActivityLaunchAnimator mActivityLaunchAnimator;

    private HeadsUpAppearanceController mHeadsUpAppearanceController;

    private boolean mVibrateOnOpening;

    private VibratorHelper mVibratorHelper;



    @Override

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



        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);

        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) {

            mMetricsLogger.action(MetricsEvent.ACTION_SYSTEM_NAVIGATION_KEY_DOWN);

            if (mNotificationPanel.isFullyCollapsed()) {

                if (mVibrateOnOpening) {

                    mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);

                }

                mNotificationPanel.expand(true /* animate */);

                mMetricsLogger.count(NotificationPanelView.COUNTER_PANEL_OPEN, 1);

            } else if (!mNotificationPanel.isInSettings() && !mNotificationPanel.isExpanding()){