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

Commit 95c1165b authored by LiZhihong's avatar LiZhihong Committed by Josep del Río
Browse files

Add global microphone mute key for keyboard 



This change will enable the "mic mute" key on keyboards to globally mute
the microphone using the SensorManager, which has UI implemented in
multiple places (quick shortcuts, privacy center, settings...).

Test: manual
Bug: 237355207
Signed-off-by: default avatarLiZhihong <lizh52@lenovo.corp-partner.google.com>
Signed-off-by: default avatarDingYong <dingyong2@lenovo.corp-partner.google.com>
Change-Id: I492e501503b0ab9f56e1fa84fcc77a8c798bcb83
parent ce1c0862

core/java/android/view/KeyEvent.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -1975,7 +1975,6 @@ public class KeyEvent extends InputEvent implements Parcelable { 
            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

core/java/com/android/internal/policy/PhoneFallbackEventHandler.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

            case KeyEvent.KEYCODE_MEDIA_NEXT:
@@ -224,7 +223,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
            }

            }





            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

services/core/java/com/android/server/policy/PhoneWindowManager.java

+21 −1
Original line number Original line Diff line number Diff line
@@ -117,6 +117,7 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.graphics.Rect;

import android.graphics.Rect;

import android.hardware.SensorPrivacyManager;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManagerInternal;

import android.hardware.display.DisplayManagerInternal;

import android.hardware.hdmi.HdmiAudioSystemClient;

import android.hardware.hdmi.HdmiAudioSystemClient;
@@ -395,6 +396,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    IStatusBarService mStatusBarService;

    IStatusBarService mStatusBarService;

    StatusBarManagerInternal mStatusBarManagerInternal;

    StatusBarManagerInternal mStatusBarManagerInternal;

    AudioManagerInternal mAudioManagerInternal;

    AudioManagerInternal mAudioManagerInternal;

    SensorPrivacyManager mSensorPrivacyManager;

    DisplayManager mDisplayManager;

    DisplayManager mDisplayManager;

    DisplayManagerInternal mDisplayManagerInternal;

    DisplayManagerInternal mDisplayManagerInternal;

    boolean mPreloadedRecentApps;

    boolean mPreloadedRecentApps;
@@ -1882,6 +1884,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mDreamManagerInternal = LocalServices.getService(DreamManagerInternal.class);

        mDreamManagerInternal = LocalServices.getService(DreamManagerInternal.class);

        mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);

        mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);

        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);

        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);

        mSensorPrivacyManager = mContext.getSystemService(SensorPrivacyManager.class);

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);

        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);

        mPackageManager = mContext.getPackageManager();

        mPackageManager = mContext.getPackageManager();
@@ -3019,6 +3022,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        return key_not_consumed;

        return key_not_consumed;

    }

    }





    private void toggleMicrophoneMuteFromKey() {

        if (mSensorPrivacyManager.supportsSensorToggle(

                SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE,

                SensorPrivacyManager.Sensors.MICROPHONE)) {

            boolean isEnabled = mSensorPrivacyManager.isSensorPrivacyEnabled(

                    SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE,

                    SensorPrivacyManager.Sensors.MICROPHONE);

            mSensorPrivacyManager.setSensorPrivacy(SensorPrivacyManager.Sensors.MICROPHONE,

                    !isEnabled);

        }

    }



    /**

    /**

     * TV only: recognizes a remote control gesture for capturing a bug report.

     * TV only: recognizes a remote control gesture for capturing a bug report.

     */

     */
@@ -3954,11 +3969,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                break;

                break;

            }

            }





            case KeyEvent.KEYCODE_MUTE:

                result &= ~ACTION_PASS_TO_USER;

                if (down && event.getRepeatCount() == 0) {

                    toggleMicrophoneMuteFromKey();

                }

                break;

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:

            case KeyEvent.KEYCODE_MEDIA_PREVIOUS: