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

Commit 68fbc156 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6254418 from cf5442cc to qt-qpr3-release

Change-Id: I137cc27ea2df13430660938a178c0627759c8d0b
parents 2f6ac765 cf5442cc
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@
    <string name="hvac_min_text">Min</string>
    <!-- String to represent largest setting of an HVAC system [CHAR LIMIT=5]-->
    <string name="hvac_max_text">Max</string>
    <!-- Text for voice recognition toast. [CHAR LIMIT=60] -->
    <string name="voice_recognition_toast">Voice recognition now handled by connected Bluetooth device</string>
</resources>
+90 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2020 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.systemui.voicerecognition.car;

import android.bluetooth.BluetoothHeadsetClient;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Handler;
import android.os.UserHandle;
import android.util.Log;
import android.widget.Toast;

import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.SysUIToast;
import com.android.systemui.SystemUI;

import javax.inject.Inject;

/**
 * Controller responsible for showing toast message when voice recognition over bluetooth device
 * getting activated.
 */
public class ConnectedDeviceVoiceRecognitionNotifier extends SystemUI {

    private static final String TAG = "CarVoiceRecognition";
    private static final int INVALID_VALUE = -1;
    private static final int VOICE_RECOGNITION_STARTED = 1;

    private Handler mHandler;

    private final BroadcastReceiver mVoiceRecognitionReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (Log.isLoggable(TAG, Log.DEBUG)) {
                Log.d(TAG, "Voice recognition received an intent!");
            }
            if (intent == null
                    || intent.getAction() == null
                    || !BluetoothHeadsetClient.ACTION_AG_EVENT.equals(intent.getAction())
                    || !intent.hasExtra(BluetoothHeadsetClient.EXTRA_VOICE_RECOGNITION)) {
                return;
            }

            int voiceRecognitionState = intent.getIntExtra(
                    BluetoothHeadsetClient.EXTRA_VOICE_RECOGNITION, INVALID_VALUE);

            if (voiceRecognitionState == VOICE_RECOGNITION_STARTED) {
                mHandler.post(() -> {
                    SysUIToast.makeText(mContext, R.string.voice_recognition_toast,
                            Toast.LENGTH_LONG).show();
                });
            }
        }
    };

    @Inject
    public ConnectedDeviceVoiceRecognitionNotifier() {
        super();
        mHandler = Dependency.get(Dependency.MAIN_HANDLER);
    }

    @Override
    public void start() {
    }

    @Override
    protected void onBootCompleted() {
        IntentFilter filter = new IntentFilter();
        filter.addAction(BluetoothHeadsetClient.ACTION_AG_EVENT);
        mContext.registerReceiverAsUser(mVoiceRecognitionReceiver, UserHandle.ALL, filter,
                /* broadcastPermission= */ null, /* scheduler= */ null);
    }
}
+0 −4
Original line number Diff line number Diff line
@@ -2776,10 +2776,6 @@ public class AudioService extends IAudioService.Stub
                setSystemAudioMute(mute);
                AudioSystem.setMasterMute(mute);
                sendMasterMuteUpdate(mute, flags);

                Intent intent = new Intent(AudioManager.MASTER_MUTE_CHANGED_ACTION);
                intent.putExtra(AudioManager.EXTRA_MASTER_VOLUME_MUTED, mute);
                sendBroadcastToAll(intent);
            }
        }
    }