From dd5f1a58c8453d56e334a54e0035392abd14c21c Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 23 Jan 2018 18:01:00 -0800 Subject: Updated call number by NW is not displayed CallCardPresenter updates a call number if the number is updated by NW. But the logic is worng. The comparing numbers are always same. Because it compares with the same objects in DialerCall#areSameNumber. This is a upstream change from: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/556000 originating number is shown in the call screen. Bug: 70201489 Test: manual - Verified that a call number that changed from a PiperOrigin-RevId: 183022988 Change-Id: I04305998e77ca120b1248636c63984b3d20f0db1 --- java/com/android/incallui/CallCardPresenter.java | 16 ++++++++++++++-- java/com/android/incallui/call/DialerCall.java | 11 ----------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'java/com') diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index eed076d3d..bdbbe8f7c 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -117,7 +117,9 @@ public class CallCardPresenter private final Handler handler = new Handler(); private DialerCall primary; + private String primaryNumber; private DialerCall secondary; + private String secondaryNumber; private ContactCacheEntry primaryContactInfo; private ContactCacheEntry secondaryContactInfo; @Nullable private ContactsPreferences contactsPreferences; @@ -284,17 +286,27 @@ public class CallCardPresenter LogUtil.v("CallCardPresenter.onStateChange", "primary call: " + primary); LogUtil.v("CallCardPresenter.onStateChange", "secondary call: " + secondary); + String primaryNumber = null; + String secondaryNumber = null; + if (primary != null) { + primaryNumber = primary.getNumber(); + } + if (secondary != null) { + secondaryNumber = secondary.getNumber(); + } final boolean primaryChanged = !(DialerCall.areSame(this.primary, primary) - && DialerCall.areSameNumber(this.primary, primary)); + && TextUtils.equals(this.primaryNumber, primaryNumber)); final boolean secondaryChanged = !(DialerCall.areSame(this.secondary, secondary) - && DialerCall.areSameNumber(this.secondary, secondary)); + && TextUtils.equals(this.secondaryNumber, secondaryNumber)); this.secondary = secondary; + this.secondaryNumber = secondaryNumber; DialerCall previousPrimary = this.primary; this.primary = primary; + this.primaryNumber = primaryNumber; if (this.primary != null) { InCallPresenter.getInstance().onForegroundCallChanged(this.primary); diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index a30367f7f..e581ba3b0 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -394,17 +394,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa return call1.getId().equals(call2.getId()); } - public static boolean areSameNumber(DialerCall call1, DialerCall call2) { - if (call1 == null && call2 == null) { - return true; - } else if (call1 == null || call2 == null) { - return false; - } - - // otherwise compare call Numbers - return TextUtils.equals(call1.getNumber(), call2.getNumber()); - } - public void addListener(DialerCallListener listener) { Assert.isMainThread(); listeners.add(listener); -- cgit v1.2.3 From 9a833fc03677a14724b235c85c5e896ea3ab48b3 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Tue, 23 Jan 2018 18:02:19 -0800 Subject: Updated nearby places search permission icon for Material. Bug: 68272797 Test: manual PiperOrigin-RevId: 183023158 Change-Id: Iccee9278a89c944c443cb0d4022554ce7f634bab --- .../res/drawable-hdpi/business_asset.png | Bin 2150 -> 2899 bytes .../res/drawable-mdpi/business_asset.png | Bin 1389 -> 1723 bytes .../res/drawable-xhdpi/business_asset.png | Bin 3047 -> 4256 bytes .../res/drawable-xxhdpi/business_asset.png | Bin 4668 -> 7824 bytes .../res/drawable-xxxhdpi/business_asset.png | Bin 6636 -> 12250 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'java/com') diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png index 56f666436..8164c9a3e 100644 Binary files a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png and b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png differ diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png index 1fc9a63e9..e749e579e 100644 Binary files a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png and b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png differ diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png index b217c3617..6014f6801 100644 Binary files a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png and b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png differ diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png index 17c0b615e..0dc4b4c89 100644 Binary files a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png and b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png differ diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png index 99d6fbdf7..ef7630302 100644 Binary files a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png and b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png differ -- cgit v1.2.3