diff options
author | Sailesh Nepal <sail@google.com> | 2014-09-15 02:52:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-15 02:52:03 +0000 |
commit | d5f83fc2a27d4a2e8c8d63c110d1713fb15911dc (patch) | |
tree | f2f86fed323785efbd52ba910b6822f199a607f4 | |
parent | e930aef8798d4de29ac352c4f8a67c06466ccc85 (diff) | |
parent | 05af823cb819c1cc627dbd89a8bca237613dbaa7 (diff) |
Merge "Fix call state icon not showing for incoming calls" into lmp-dev
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 8 |
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); |