Merge changes I3f6a5887,Icf91804d am: 360c751fe5 am: 1a9d70ab08
am: 783d205dad
Change-Id: I5464ce3ba9452dc67f2c7389e9e754476bc093ed
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java b/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java
index 519a0df..efa1060 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java
@@ -17,6 +17,7 @@
package com.android.dialer.voicemail.listui;
import android.content.Context;
+import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener;
@@ -63,6 +64,7 @@
() -> {
try {
mediaPlayer.setDataSource(context, uri);
+ setAudioManagerToNonSpeakerMode(context);
} catch (IOException e) {
LogUtil.i(
"NewVoicemailMediaPlayer",
@@ -86,6 +88,13 @@
}
}
+ /** We should never start playing voicemails from the speaker mode */
+ private void setAudioManagerToNonSpeakerMode(Context context) {
+ AudioManager audioManager = context.getSystemService(AudioManager.class);
+ audioManager.setMode(AudioManager.STREAM_MUSIC);
+ audioManager.setSpeakerphoneOn(false);
+ }
+
private void verifyListenersNotNull() {
Assert.isNotNull(
newVoicemailMediaPlayerOnErrorListener,
diff --git a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
index ef3c1f9..d850751 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
@@ -16,8 +16,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/dialer_theme_color">
+ android:layout_height="match_parent">
<include layout="@layout/rtt_banner"/>