From 32643ee1b0af99ae67dfd4641c4c163b699fe011 Mon Sep 17 00:00:00 2001 From: yueg Date: Wed, 28 Mar 2018 15:28:49 -0700 Subject: Remove unnecessary call to StatusBarNotifier.updateNotification(). The call for incoming call is covered in StatusBarNotifier.onStateChange(). The two calls in InCallActivity is not useful (maybe is before notification becoming foreground). Test: manual PiperOrigin-RevId: 190845157 Change-Id: I0f84f15cfda5294566fa8976e09aac5163f85aa9 --- java/com/android/incallui/InCallActivity.java | 3 --- java/com/android/incallui/InCallPresenter.java | 17 ----------------- 2 files changed, 20 deletions(-) diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 8144ddb10..9d08dc4b6 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -476,7 +476,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity if (!InCallPresenter.getInstance().isReadyForTearDown()) { updateTaskDescription(); - InCallPresenter.getInstance().updateNotification(); } // If there is a pending request to show or hide the dialpad, handle that now. @@ -534,8 +533,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity dialpadFragment.onDialerKeyUp(null); } - InCallPresenter.getInstance().updateNotification(); - InCallPresenter.getInstance().getPseudoScreenState().removeListener(this); Trace.endSection(); } diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index a4b90f1a6..2e98a969d 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -1050,14 +1050,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud "updateIsChangingConfigurations = " + isChangingConfigurations); } - void updateNotification() { - // We need to update the notification bar when we leave the UI because that - // could trigger it to show again. - if (statusBarNotifier != null) { - statusBarNotifier.updateNotification(); - } - } - /** Called when the activity goes in/out of the foreground. */ public void onUiShowing(boolean showing) { if (proximitySensor != null) { @@ -1316,11 +1308,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud // know that start-up is complete. // // [ AND NOW YOU'RE IN THE CALL. voila! ] - // - // Our app is started using a fullScreen notification. We need to do this whenever - // we get an incoming call. Depending on the current context of the device, either a - // incoming call HUN or the actual InCallActivity will be shown. - final boolean startIncomingCallSequence = (InCallState.INCOMING == newState); // A dialog to show on top of the InCallUI to select a PhoneAccount final boolean showAccountPicker = (InCallState.WAITING_FOR_ACCOUNT == newState); @@ -1387,10 +1374,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud if (showCallUi || showAccountPicker) { LogUtil.i("InCallPresenter.startOrFinishUi", "Start in call UI"); showInCall(false /* showDialpad */, !showAccountPicker /* newOutgoingCall */); - } else if (startIncomingCallSequence) { - LogUtil.i("InCallPresenter.startOrFinishUi", "Start Full Screen in call UI"); - - statusBarNotifier.updateNotification(); } else if (newState == InCallState.NO_CALLS) { // The new state is the no calls state. Tear everything down. attemptFinishActivity(); -- cgit v1.2.3 From 57751c35a0d4f25a817378b0a4b1d14336a0d4e8 Mon Sep 17 00:00:00 2001 From: linyuh Date: Wed, 28 Mar 2018 16:32:54 -0700 Subject: Create a common widget (ContactPhotoView) for a contact photo and its optional badge. Bug: 70988682 Test: ContactPhotoViewTest PiperOrigin-RevId: 190855440 Change-Id: Ib658efa6486b66548c710804049517905dc67b13 --- .../dialer/calllog/ui/NewCallLogViewHolder.java | 21 ++--- .../drawable/contact_photo_badge_background.xml | 23 ----- .../calllog/ui/res/layout/new_call_log_entry.xml | 50 +++-------- .../android/dialer/widget/ContactPhotoView.java | 97 ++++++++++++++++++++++ .../drawable/contact_photo_badge_background.xml | 23 +++++ .../widget/res/layout/contact_photo_view.xml | 50 +++++++++++ 6 files changed, 185 insertions(+), 79 deletions(-) delete mode 100644 java/com/android/dialer/calllog/ui/res/drawable/contact_photo_badge_background.xml create mode 100644 java/com/android/dialer/widget/ContactPhotoView.java create mode 100644 java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml create mode 100644 java/com/android/dialer/widget/res/layout/contact_photo_view.xml diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java index aa71ec4e1..9809d97f5 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java @@ -24,9 +24,7 @@ import android.support.annotation.DrawableRes; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; -import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.QuickContactBadge; import android.widget.TextView; import com.android.dialer.calllog.model.CoalescedRow; import com.android.dialer.calllog.ui.menu.NewCallLogMenu; @@ -39,6 +37,7 @@ import com.android.dialer.compat.telephony.TelephonyManagerCompat; import com.android.dialer.glidephotomanager.GlidePhotoManager; import com.android.dialer.oem.MotorolaUtils; import com.android.dialer.time.Clock; +import com.android.dialer.widget.ContactPhotoView; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import java.util.Locale; @@ -48,11 +47,10 @@ import java.util.concurrent.ExecutorService; final class NewCallLogViewHolder extends RecyclerView.ViewHolder { private final Context context; + private final ContactPhotoView contactPhotoView; private final TextView primaryTextView; private final TextView callCountTextView; private final TextView secondaryTextView; - private final QuickContactBadge contactPhoto; - private final FrameLayout contactBadgeContainer; private final ImageView callTypeIcon; private final ImageView hdIcon; private final ImageView wifiIcon; @@ -75,11 +73,10 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { GlidePhotoManager glidePhotoManager) { super(view); this.context = view.getContext(); + contactPhotoView = view.findViewById(R.id.contact_photo_view); primaryTextView = view.findViewById(R.id.primary_text); callCountTextView = view.findViewById(R.id.call_count); secondaryTextView = view.findViewById(R.id.secondary_text); - contactPhoto = view.findViewById(R.id.quick_contact_photo); - contactBadgeContainer = view.findViewById(R.id.contact_badge_container); callTypeIcon = view.findViewById(R.id.call_type_icon); hdIcon = view.findViewById(R.id.hd_icon); wifiIcon = view.findViewById(R.id.wifi_icon); @@ -154,20 +151,12 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { } private void setPhoto(CoalescedRow row) { - glidePhotoManager.loadQuickContactBadge( - contactPhoto, + contactPhotoView.setPhoto( NumberAttributesConverter.toPhotoInfoBuilder(row.getNumberAttributes()) .setFormattedNumber(row.getFormattedNumber()) + .setIsVideo((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) .setIsVoicemail(row.getIsVoicemailCall()) .build()); - - contactBadgeContainer.setVisibility( - shouldShowVideoCallIcon(row) ? View.VISIBLE : View.INVISIBLE); - } - - private static boolean shouldShowVideoCallIcon(CoalescedRow row) { - return (row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO - && !row.getNumberAttributes().getIsSpam(); } private void setFeatureIcons(CoalescedRow row) { diff --git a/java/com/android/dialer/calllog/ui/res/drawable/contact_photo_badge_background.xml b/java/com/android/dialer/calllog/ui/res/drawable/contact_photo_badge_background.xml deleted file mode 100644 index 4dcc7057e..000000000 --- a/java/com/android/dialer/calllog/ui/res/drawable/contact_photo_badge_background.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml index 22854311d..672a9a35e 100644 --- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml +++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml @@ -21,43 +21,13 @@ android:layout_height="wrap_content" android:minHeight="72dp"> - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/widget/res/layout/contact_photo_view.xml b/java/com/android/dialer/widget/res/layout/contact_photo_view.xml new file mode 100644 index 000000000..e505e5866 --- /dev/null +++ b/java/com/android/dialer/widget/res/layout/contact_photo_view.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3