diff options
| author | Nancy Chen <nancychen@google.com> | 2014-08-20 16:50:20 -0700 |
|---|---|---|
| committer | Nancy Chen <nancychen@google.com> | 2014-08-20 16:50:20 -0700 |
| commit | a2911f91d19ef6f3ecf072c91f821f743b58b91b (patch) | |
| tree | 12acf8afa87d9da792deca82c4790c86ddf91050 | |
| parent | c44f654b992c6ab8a4acff9cb5aa2678c58755d9 (diff) | |
Adjust SIM icon tint and fix InCallUI glitches for call state icon.
Default SIM icon tint should be the same as the color of the call state
label. Fixed animation for call state icon.
Bug: 16685783
Change-Id: Ie170027e0a14096442fb78c8e6d8b469aa03b51d
| -rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/layout/select_account_list_item.xml | 1 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index 4231922d1..1f3b9549b 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -47,7 +47,7 @@ android:layout_marginEnd="4dp" android:baselineAlignBottom="true" android:tint="@color/incall_accent_color" - android:alpha="0.7" + android:alpha="0.0" android:scaleType="centerInside" android:visibility="gone" /> diff --git a/InCallUI/res/layout/select_account_list_item.xml b/InCallUI/res/layout/select_account_list_item.xml index 0b24c9b9f..bb618ffeb 100644 --- a/InCallUI/res/layout/select_account_list_item.xml +++ b/InCallUI/res/layout/select_account_list_item.xml @@ -24,6 +24,7 @@ <ImageView android:id="@+id/icon" android:layout_width="48dp" android:layout_height="48dp" + android:tint="@color/dialtacts_secondary_text_color" android:scaleType="center" /> <TextView android:id="@+id/text" diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 8ca1dd67c..6defe799a 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -502,6 +502,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mCallStateIcon.setVisibility(View.GONE); } else { mCallStateIcon.setVisibility(View.VISIBLE); + mCallStateIcon.setImageAlpha(255); mCallStateIcon.setImageDrawable(connectionIcon); } @@ -515,8 +516,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr if (state == Call.State.ACTIVE || state == Call.State.CONFERENCED) { mCallStateLabel.clearAnimation(); + mCallStateIcon.clearAnimation(); } else { mCallStateLabel.startAnimation(mPulseAnimation); + mCallStateIcon.startAnimation(mPulseAnimation); } } else { Animation callStateAnimation = mCallStateLabel.getAnimation(); @@ -526,6 +529,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mCallStateLabel.setText(null); mCallStateLabel.setAlpha(0); mCallStateLabel.setVisibility(View.GONE); + mCallStateIcon.setImageAlpha(0); + mCallStateIcon.setVisibility(View.GONE); mCallStateVideoCallIcon.setVisibility(View.GONE); } @@ -962,6 +967,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr @Override public void onAnimationStart(Animator animation) { assignTranslateAnimation(mCallStateLabel, 1); + assignTranslateAnimation(mCallStateIcon, 1); assignTranslateAnimation(mPrimaryName, 2); assignTranslateAnimation(mCallNumberAndLabel, 3); assignTranslateAnimation(mCallTypeLabel, 4); |