From c857f90590e7d7fcffa89511982eb33afd34805f Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Mon, 15 May 2017 14:05:33 -0700 Subject: Update Dialer to v10 RC32 This release was created following the instructions at: go/dialer-aosp-release Subsequent dialer releases will follow as O bugs are fixed, until we reach our final RC. Version: 10 Candidate: RC32 Branch: dialer-android_release_branch/153304843.1 dialer-android_20170416.00/dialer-android_20170416.00_RC32 This release contains the following bug fixes since RC17: Bug: 33176679 33272455 3646510 36773894 37297649 37413780 37513689 37640315 37680595 37698062 37873639 37901752 37919295 37953423 38062852 38069600 38137349 38173549 38180252 38191514 Test: make, on device Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a --- .../incallui/contactgrid/ContactGridManager.java | 63 ++++++++++++++-------- 1 file changed, 42 insertions(+), 21 deletions(-) (limited to 'java/com/android/incallui/contactgrid/ContactGridManager.java') diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index b3b775be2..ed533be58 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable; import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.view.ViewCompat; import android.telecom.TelecomManager; import android.text.TextUtils; import android.view.View; @@ -50,13 +51,13 @@ public class ContactGridManager { // Row 0: [Wi-Fi icon] Calling via Starbucks Wi-Fi // Row 0: [Wi-Fi icon] Starbucks Wi-Fi // Row 0: Hey Jake, pick up! - private ImageView connectionIconImageView; - private TextView statusTextView; + private final ImageView connectionIconImageView; + private final TextView statusTextView; // Row 1: Jake Peralta [Contact photo] // Row 1: Walgreens // Row 1: +1 (650) 253-0000 - private TextView contactNameTextView; + private final TextView contactNameTextView; @Nullable private ImageView avatarImageView; // Row 2: Mobile +1 (650) 253-0000 @@ -65,13 +66,14 @@ public class ContactGridManager { // Row 2: Hanging up // Row 2: [Alert sign] Suspected spam caller // Row 2: Your emergency callback number: +1 (650) 253-0000 - private ImageView workIconImageView; - private ImageView hdIconImageView; - private ImageView forwardIconImageView; - private ImageView spamIconImageView; - private ViewAnimator bottomTextSwitcher; - private TextView bottomTextView; - private Chronometer bottomTimerView; + private final ImageView workIconImageView; + private final ImageView hdIconImageView; + private final ImageView forwardIconImageView; + private final TextView forwardedNumberView; + private final ImageView spamIconImageView; + private final ViewAnimator bottomTextSwitcher; + private final TextView bottomTextView; + private final Chronometer bottomTimerView; private int avatarSize; private boolean hideAvatar; private boolean showAnonymousAvatar; @@ -89,16 +91,17 @@ public class ContactGridManager { this.avatarImageView = avatarImageView; this.avatarSize = avatarSize; this.showAnonymousAvatar = showAnonymousAvatar; - connectionIconImageView = (ImageView) view.findViewById(R.id.contactgrid_connection_icon); - statusTextView = (TextView) view.findViewById(R.id.contactgrid_status_text); - contactNameTextView = (TextView) view.findViewById(R.id.contactgrid_contact_name); - workIconImageView = (ImageView) view.findViewById(R.id.contactgrid_workIcon); - hdIconImageView = (ImageView) view.findViewById(R.id.contactgrid_hdIcon); - forwardIconImageView = (ImageView) view.findViewById(R.id.contactgrid_forwardIcon); - spamIconImageView = (ImageView) view.findViewById(R.id.contactgrid_spamIcon); - bottomTextSwitcher = (ViewAnimator) view.findViewById(R.id.contactgrid_bottom_text_switcher); - bottomTextView = (TextView) view.findViewById(R.id.contactgrid_bottom_text); - bottomTimerView = (Chronometer) view.findViewById(R.id.contactgrid_bottom_timer); + connectionIconImageView = view.findViewById(R.id.contactgrid_connection_icon); + statusTextView = view.findViewById(R.id.contactgrid_status_text); + contactNameTextView = view.findViewById(R.id.contactgrid_contact_name); + workIconImageView = view.findViewById(R.id.contactgrid_workIcon); + hdIconImageView = view.findViewById(R.id.contactgrid_hdIcon); + forwardIconImageView = view.findViewById(R.id.contactgrid_forwardIcon); + forwardedNumberView = view.findViewById(R.id.contactgrid_forwardNumber); + spamIconImageView = view.findViewById(R.id.contactgrid_spamIcon); + bottomTextSwitcher = view.findViewById(R.id.contactgrid_bottom_text_switcher); + bottomTextView = view.findViewById(R.id.contactgrid_bottom_text); + bottomTimerView = view.findViewById(R.id.contactgrid_bottom_timer); contactGridLayout = (View) contactNameTextView.getParent(); letterTile = new LetterTileDrawable(context.getResources()); @@ -336,9 +339,27 @@ public class ContactGridManager { } else if (!info.isHdAttemptingIconVisible) { hdIconImageView.setVisibility(View.GONE); } - forwardIconImageView.setVisibility(info.isForwardIconVisible ? View.VISIBLE : View.GONE); spamIconImageView.setVisibility(info.isSpamIconVisible ? View.VISIBLE : View.GONE); + if (info.isForwardIconVisible) { + forwardIconImageView.setVisibility(View.VISIBLE); + forwardedNumberView.setVisibility(View.VISIBLE); + if (info.isTimerVisible) { + bottomTextSwitcher.setVisibility(View.VISIBLE); + if (ViewCompat.getLayoutDirection(contactGridLayout) == ViewCompat.LAYOUT_DIRECTION_LTR) { + forwardedNumberView.setText(TextUtils.concat(info.label, " • ")); + } else { + forwardedNumberView.setText(TextUtils.concat(" • ", info.label)); + } + } else { + bottomTextSwitcher.setVisibility(View.GONE); + forwardedNumberView.setText(info.label); + } + } else { + forwardIconImageView.setVisibility(View.GONE); + forwardedNumberView.setVisibility(View.GONE); + } + if (info.isTimerVisible) { bottomTextSwitcher.setDisplayedChild(1); bottomTimerView.setBase( -- cgit v1.2.3