diff options
| author | Nancy Chen <nancychen@google.com> | 2014-08-21 00:02:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
| commit | 8d48032acd64d4c09b7fe5f61c789f4e5ffaec45 (patch) | |
| tree | 2a4ea607ddc332934fa3a86eeafc4f5bce2b4724 | |
| parent | 5554bbb2367af1426abf5b3528d1d5cb8f7e5712 (diff) | |
| parent | a2911f91d19ef6f3ecf072c91f821f743b58b91b (diff) | |
Merge "Adjust SIM icon tint and fix InCallUI glitches for call state icon." into lmp-dev
| -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 3759e3e9a..1999fced7 100644 --- a/InCallUI/res/layout/select_account_list_item.xml +++ b/InCallUI/res/layout/select_account_list_item.xml @@ -25,6 +25,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 1319246b0..bd32684d0 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); |