UI refresh for ringing screen.

Bug: 79878432
Test: manual
PiperOrigin-RevId: 201608196
Change-Id: Idff45359c5ddf3dacbeb77b103d3b53d3bf34334

4 files changed, 1 insertions, 33 deletions

diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 8d8b08791..f5da3effd 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -880,8 +880,6 @@ public class AnswerFragment extends Fragment
     if (primaryCallState != null) {
       contactGridManager.setCallState(primaryCallState);
     }
-
-    restoreBackgroundMaskColor();
   }
 
   @Override
@@ -900,12 +898,6 @@ public class AnswerFragment extends Fragment
 
   @Override
   public void onAnswerProgressUpdate(@FloatRange(from = -1f, to = 1f) float answerProgress) {
-    // Don't fade the window background for call waiting or video upgrades. Fading the background
-    // shows the system wallpaper which looks bad because on reject we switch to another call.
-    if (primaryCallState.state() == DialerCallState.INCOMING && !isVideoCall()) {
-      answerScreenDelegate.updateWindowBackgroundColor(answerProgress);
-    }
-
     // Fade and scale contact name and video call text
     float startDelay = .25f;
     // Header progress is zero over positiveAdjustedProgress = [0, startDelay],
@@ -934,7 +926,6 @@ public class AnswerFragment extends Fragment
   @Override
   public void resetAnswerProgress() {
     affordanceHolderLayout.reset(true);
-    restoreBackgroundMaskColor();
   }
 
   private void animateEntry(@NonNull View rootView) {
@@ -1003,10 +994,6 @@ public class AnswerFragment extends Fragment
     }
   }
 
-  private void restoreBackgroundMaskColor() {
-    answerScreenDelegate.updateWindowBackgroundColor(0);
-  }
-
   private void restoreSwipeHintTexts() {
     if (getAnswerMethod() != null) {
       if (allowAnswerAndRelease()) {
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values/styles.xml b/java/com/android/incallui/answer/impl/answermethod/res/values/styles.xml
deleted file mode 100644
index fd3ca7ca0..000000000
--- a/java/com/android/incallui/answer/impl/answermethod/res/values/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <style name="Dialer.Incall.TextAppearance.Hint">
-    <item name="android:textSize">14sp</item>
-    <item name="android:textStyle">italic</item>
-  </style>
-</resources>
diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml
index f8e48942c..246abc577 100644
--- a/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml
+++ b/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml
@@ -21,5 +21,4 @@
   android:id="@id/contactgrid_avatar"
   android:layout_width="@dimen/answer_avatar_size"
   android:layout_height="@dimen/answer_avatar_size"
-  android:layout_gravity="center"
-  android:elevation="@dimen/answer_data_elevation"/>
+  android:layout_gravity="center"/>
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
index 172d9646a..db2af9bbb 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
@@ -16,7 +16,6 @@
 
 package com.android.incallui.answer.protocol;
 
-import android.support.annotation.FloatRange;
 import com.android.incallui.incalluilock.InCallUiLock;
 
 /** Callbacks implemented by the container app for this module. */
@@ -37,16 +36,6 @@ public interface AnswerScreenDelegate {
   void onAnswerAndReleaseButtonEnabled();
 
   void onAnswerAndReleaseButtonDisabled();
-  /**
-   * Sets the window background color based on foreground call's theme and the given progress. This
-   * is called from the answer UI to animate the accept and reject action.
-   *
-   * <p>When the user is rejecting we animate the background color to a mostly transparent gray. The
-   * end effect is that the home screen shows through.
-   *
-   * @param progress float from -1 to 1. -1 is fully rejected, 1 is fully accepted, and 0 is neutral
-   */
-  void updateWindowBackgroundColor(@FloatRange(from = -1f, to = 1.0f) float progress);
 
   /** Returns true if any answer/reject action timed out. */
   boolean isActionTimeout();