From e309c166bc20a62d7ec2b1e0fa0a0eccab187016 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Wed, 28 Feb 2018 14:33:47 -0800
Subject: Remove background of RTT chat fragment.

The default incall gradiant background will be shown instead.

Bug: 67596257
Test: manual
PiperOrigin-RevId: 187384455
Change-Id: Icf91804d78aa98d051248a9eca0d13be0ea880f0
---
 java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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"/>
 
-- 
cgit v1.2.3


From 99e0aa4d3be26001182634f15327da5b0749c74c Mon Sep 17 00:00:00 2001
From: uabdullah <uabdullah@google.com>
Date: Wed, 28 Feb 2018 15:03:28 -0800
Subject: Never start playing voicemails in the NUI VM tab from the speaker

All voicemails played from the VM tab should always be played from the non-speaker mode.

Bug: 71500892
Test: N/A
PiperOrigin-RevId: 187388964
Change-Id: I3f6a5887784b0192074157cfd8a91727d124ed06
---
 .../android/dialer/voicemail/listui/NewVoicemailMediaPlayer.java | 9 +++++++++
 1 file changed, 9 insertions(+)

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,
-- 
cgit v1.2.3