From a42005350c1dd0aa956fe5f911f59e704b58c1c7 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 17 Mar 2015 14:28:21 -0700 Subject: DO NOT MERGE Don't hide caller photo for video call Bug: 19728020 Change-Id: I6e5259c63553de9e5060621bcc749d1039b67ea1 --- InCallUI/src/com/android/incallui/CallCardPresenter.java | 9 --------- 1 file changed, 9 deletions(-) (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java') diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 0464edff3..762d8688e 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -250,14 +250,6 @@ public class CallCardPresenter extends Presenter getUi().showHdAudioIndicator(false); } - // Hide/show the contact photo based on the video state. - // If the primary call is a video call on hold, still show the contact photo. - // If the primary call is an active video call, hide the contact photo. - if (mPrimary != null) { - getUi().setPhotoVisible(!(mPrimary.isVideoCall(mContext) && - callState != Call.State.ONHOLD)); - } - maybeShowManageConferenceCallButton(); final boolean enableEndCallButton = Call.State.isConnectingOrConnected(callState) && @@ -794,7 +786,6 @@ public class CallCardPresenter extends Presenter void setPrimaryLabel(String label); void setEndCallButtonEnabled(boolean enabled, boolean animate); void setCallbackNumber(String number, boolean isEmergencyCalls); - void setPhotoVisible(boolean isVisible); void setProgressSpinnerVisible(boolean visible); void showHdAudioIndicator(boolean visible); void showManageConferenceCallButton(boolean visible); -- cgit v1.2.3 From 82332c921b8dcef213700822e2404b005adab00c Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 20 Mar 2015 13:57:17 -0700 Subject: Don't show SSID for Wi-Fi calls. - Delete wifi icon and method to get SSID. + Use labels provided by StatusHints instead. I'm not very happy with the additional "isWifi" cases I ended up adding in call card fragment. I felt this was necessary because of assumptions in some cases that if a label is provided, it should be formatted as a phone account source. While this was true before, it's becoming less so. I feel like the fragment shouldn't have to worry about formatting or choosing the label based on the call and conditions. It should just display the label if it thinks it is appropriate to show a label given the call state. To fix that, it seems like logic should be moved to the presenter instead, and possibly to Telephony. But, I'm hesitant to do that until these WFC changes back merge to master because of potential merge conflicts and its slightly more risky for this branch, because it starts dealing with logic/flows outside of WFC.. Bug: 19866988 Change-Id: Iacd5a09259c84ea7be28b0170ae603eb9561f7ca --- .../drawable-hdpi/ic_signal_wifi_4_bar_18dp.png | Bin 290 -> 0 bytes .../drawable-mdpi/ic_signal_wifi_4_bar_18dp.png | Bin 204 -> 0 bytes .../drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png | Bin 339 -> 0 bytes .../drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png | Bin 474 -> 0 bytes .../drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png | Bin 619 -> 0 bytes .../src/com/android/incallui/CallCardFragment.java | 20 +++++--- .../com/android/incallui/CallCardPresenter.java | 51 ++------------------- 7 files changed, 19 insertions(+), 52 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png delete mode 100644 InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java') diff --git a/InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png deleted file mode 100644 index d7b98055e..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png deleted file mode 100644 index d537ab469..000000000 Binary files a/InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png deleted file mode 100644 index 5a5319212..000000000 Binary files a/InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png deleted file mode 100644 index b627198f5..000000000 Binary files a/InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png deleted file mode 100644 index f4105ec8d..000000000 Binary files a/InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png and /dev/null differ diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 814876105..28f449b93 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -488,10 +488,11 @@ public class CallCardFragment extends BaseFragment private CallTimer mCallTimer; private Context mContext; - private WifiManager mWifiManager; public static class ContactLookupCallback implements ContactInfoCacheCallback { private final WeakReference mCallCardPresenter; @@ -109,7 +107,6 @@ public class CallCardPresenter extends Presenter public void init(Context context, Call call) { mContext = Preconditions.checkNotNull(context); - mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); // Call may be null if disconnect happened already. if (call != null) { @@ -246,7 +243,8 @@ public class CallCardPresenter extends Presenter new DisconnectCause(DisconnectCause.UNKNOWN), null, null, - null); + null, + false /* isWifi */); getUi().showHdAudioIndicator(false); } @@ -301,7 +299,8 @@ public class CallCardPresenter extends Presenter mPrimary.getDisconnectCause(), getConnectionLabel(), getCallStateIcon(), - getGatewayNumber()); + getGatewayNumber(), + primaryCallCan(Details.CAPABILITY_WIFI)); boolean showHdAudioIndicator = isPrimaryCallActive() && primaryCallCan(Details.CAPABILITY_HIGH_DEF_AUDIO); @@ -600,13 +599,6 @@ public class CallCardPresenter extends Presenter return statusHints.getLabel().toString(); } - // Assume the SSID of the connection reported by the WifiManager is the name of the wifi - // network used for calling, since currently a phone only connects to a single wifi network. - if (isPrimaryCallActive() && primaryCallCan(Details.CAPABILITY_WIFI) - && mWifiManager.getConnectionInfo() != null) { - return formatWifiSSID(mWifiManager.getConnectionInfo().getSSID()); - } - if (hasOutgoingGatewayCall() && getUi() != null) { // Return the label for the gateway app on outgoing calls. final PackageManager pm = mContext.getPackageManager(); @@ -632,11 +624,6 @@ public class CallCardPresenter extends Presenter } } - if (primaryCallCan(Details.CAPABILITY_WIFI) && (isPrimaryCallActive() - || (mPrimary != null && mPrimary.getState() == Call.State.INCOMING))) { - return mContext.getResources().getDrawable(R.drawable.ic_signal_wifi_4_bar_18dp); - } - return null; } @@ -742,34 +729,6 @@ public class CallCardPresenter extends Presenter return photo; } - /** - * Strip quotations off the outside of a Wifi SSID identifier. For example, \"GoogleGuest\" - * becomes GoogleGuest. - * - * TODO: Move into utility class. - * TODO: Add unit tests. - * - * @param ssid The ssid of the wifi network. - */ - private String formatWifiSSID(String ssid) { - if (TextUtils.isEmpty(ssid)) { - return ""; - } - - // Trim quotation if first character. - if (ssid.charAt(0) == '\"') { - ssid = ssid.substring(1); - } - - // Trim quotation if last character. - int lastIndex = ssid.length() - 1; - if (lastIndex >= 0 && ssid.charAt(lastIndex) == '\"') { - ssid = ssid.substring(0, lastIndex); - } - - return ssid; - } - public interface CallCardUi extends Ui { void setVisible(boolean on); void setCallCardVisible(boolean visible); @@ -779,7 +738,7 @@ public class CallCardPresenter extends Presenter String providerLabel, boolean isConference); void setCallState(int state, int videoState, int sessionModificationState, DisconnectCause disconnectCause, String connectionLabel, - Drawable connectionIcon, String gatewayNumber); + Drawable connectionIcon, String gatewayNumber, boolean isWifi); void setPrimaryCallElapsedTime(boolean show, long duration); void setPrimaryName(String name, boolean nameIsNumber); void setPrimaryImage(Drawable image); -- cgit v1.2.3