diff options
Diffstat (limited to 'java/com/android/incallui/contactgrid')
3 files changed, 14 insertions, 33 deletions
diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java index 6ddce4533..228c786a0 100644 --- a/java/com/android/incallui/contactgrid/BottomRow.java +++ b/java/com/android/incallui/contactgrid/BottomRow.java @@ -45,7 +45,7 @@ public class BottomRow { @Nullable public final CharSequence label; public final boolean isTimerVisible; public final boolean isWorkIconVisible; - public final boolean isHdAttemptinIconVisible; + public final boolean isHdAttemptingIconVisible; public final boolean isHdIconVisible; public final boolean isForwardIconVisible; public final boolean isSpamIconVisible; @@ -55,7 +55,7 @@ public class BottomRow { @Nullable CharSequence label, boolean isTimerVisible, boolean isWorkIconVisible, - boolean isHdAttemptinIconVisible, + boolean isHdAttemptingIconVisible, boolean isHdIconVisible, boolean isForwardIconVisible, boolean isSpamIconVisible, @@ -63,7 +63,7 @@ public class BottomRow { this.label = label; this.isTimerVisible = isTimerVisible; this.isWorkIconVisible = isWorkIconVisible; - this.isHdAttemptinIconVisible = isHdAttemptinIconVisible; + this.isHdAttemptingIconVisible = isHdAttemptingIconVisible; this.isHdIconVisible = isHdIconVisible; this.isForwardIconVisible = isForwardIconVisible; this.isSpamIconVisible = isSpamIconVisible; @@ -122,7 +122,7 @@ public class BottomRow { } private static CharSequence getLabelForPhoneNumber(PrimaryInfo primaryInfo) { - if (primaryInfo.nameIsNumber) { + if (primaryInfo.location != null) { return primaryInfo.location; } if (!TextUtils.isEmpty(primaryInfo.number)) { diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index a0b687c2d..ddbceb052 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -320,14 +320,15 @@ public class ContactGridManager { bottomTextView.setAllCaps(info.isSpamIconVisible); workIconImageView.setVisibility(info.isWorkIconVisible ? View.VISIBLE : View.GONE); boolean wasHdIconVisible = hdIconImageView.getVisibility() == View.VISIBLE; - if (!wasHdIconVisible && info.isHdAttemptinIconVisible) { + hdIconImageView.setVisibility( + info.isHdIconVisible || info.isHdAttemptingIconVisible ? View.VISIBLE : View.GONE); + if (!wasHdIconVisible && info.isHdAttemptingIconVisible) { Animation animation = AnimationUtils.loadAnimation(context, R.anim.blinking); hdIconImageView.startAnimation(animation); - } else if (wasHdIconVisible && !info.isHdAttemptinIconVisible) { + } else if (wasHdIconVisible && !info.isHdAttemptingIconVisible) { hdIconImageView.clearAnimation(); + hdIconImageView.setAlpha(1f); } - hdIconImageView.setVisibility( - info.isHdIconVisible || info.isHdAttemptinIconVisible ? View.VISIBLE : View.GONE); forwardIconImageView.setVisibility(info.isForwardIconVisible ? View.VISIBLE : View.GONE); spamIconImageView.setVisibility(info.isSpamIconVisible ? View.VISIBLE : View.GONE); diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml index b7a3fe7d4..b6028ed9c 100644 --- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml +++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml @@ -9,41 +9,21 @@ tools:showIn="@layout/incall_contact_grid"> <ImageView android:id="@id/contactgrid_workIcon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginEnd="8dp" - android:scaleType="fitCenter" android:src="@drawable/ic_work_profile" - android:tint="#ffffff" - tools:visibility="gone" - /> + style="@style/BottomRowIcon"/> <ImageView android:id="@id/contactgrid_hdIcon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginEnd="8dp" - android:scaleType="fitCenter" android:src="@drawable/quantum_ic_hd_white_24" - tools:visibility="gone" - /> + style="@style/BottomRowIcon" + android:visibility="gone"/> <ImageView android:id="@id/contactgrid_forwardIcon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginEnd="8dp" - android:scaleType="fitCenter" android:src="@drawable/quantum_ic_forward_white_24" - tools:visibility="gone" - /> + style="@style/BottomRowIcon"/> <ImageView android:id="@+id/contactgrid_spamIcon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginEnd="8dp" - android:scaleType="fitCenter" android:src="@drawable/quantum_ic_report_white_18" - tools:visibility="gone" - /> + style="@style/BottomRowIcon"/> <ViewAnimator android:id="@+id/contactgrid_bottom_text_switcher" android:layout_width="wrap_content" |