am 06ebd50a: am 167e9a39: Merge "Fix call state icon not showing for incoming calls" into lmp-dev

* commit '06ebd50ae608abd857a128f668436d3471b5133c':
  Fix call state icon not showing for incoming calls

1 files changed, 6 insertions, 2 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 809e66616..90a9d0645 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -515,7 +515,9 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                 mCallStateIcon.setVisibility(View.GONE);
             } else {
                 mCallStateIcon.setVisibility(View.VISIBLE);
-                mCallStateIcon.setImageAlpha(255);
+                // Invoke setAlpha(float) instead of setAlpha(int) to set the view's alpha. This is
+                // needed because the pulse animation operates on the view alpha.
+                mCallStateIcon.setAlpha(1.0f);
                 mCallStateIcon.setImageDrawable(connectionIcon);
             }
 
@@ -542,7 +544,9 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             mCallStateLabel.setText(null);
             mCallStateLabel.setAlpha(0);
             mCallStateLabel.setVisibility(View.GONE);
-            mCallStateIcon.setImageAlpha(0);
+            // Invoke setAlpha(float) instead of setAlpha(int) to set the view's alpha. This is
+            // needed because the pulse animation operates on the view alpha.
+            mCallStateIcon.setAlpha(0.0f);
             mCallStateIcon.setVisibility(View.GONE);
 
             mCallStateVideoCallIcon.setVisibility(View.GONE);