diff options
| author | uabdullah <uabdullah@google.com> | 2018-03-01 01:02:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 01:02:17 +0000 |
| commit | acc041d89b4ad6d1569926a9b2266c8d491cc7a8 (patch) | |
| tree | a575aa395047ac57a6864f518b480e0403f81b0f /java/com | |
| parent | 0abdf808c5080b8859ba6157a55c7584d6b01eb0 (diff) | |
| parent | 783d205dad0fa68c5de2f62794c9325d1a6725ba (diff) | |
| download | android_packages_apps_Dialer-acc041d89b4ad6d1569926a9b2266c8d491cc7a8.tar.gz android_packages_apps_Dialer-acc041d89b4ad6d1569926a9b2266c8d491cc7a8.tar.bz2 android_packages_apps_Dialer-acc041d89b4ad6d1569926a9b2266c8d491cc7a8.zip | |
Merge changes I3f6a5887,Icf91804d am: 360c751fe5 am: 1a9d70ab08
am: 783d205dad
Change-Id: I5464ce3ba9452dc67f2c7389e9e754476bc093ed
Diffstat (limited to 'java/com')
| -rw-r--r-- | java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java | 9 | ||||
| -rw-r--r-- | java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java b/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java index 519a0dfbd..efa1060ed 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 @@ public class NewVoicemailMediaPlayer { () -> { try { mediaPlayer.setDataSource(context, uri); + setAudioManagerToNonSpeakerMode(context); } catch (IOException e) { LogUtil.i( "NewVoicemailMediaPlayer", @@ -86,6 +88,13 @@ public class NewVoicemailMediaPlayer { } } + /** 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 ef3c1f91a..d85075106 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"/> |