From f8b0677bed382046cb26e38a8442a9509d1e835c Mon Sep 17 00:00:00 2001 From: Sailesh Nepal Date: Wed, 2 Jul 2014 21:38:08 -0700 Subject: Remove handoff UI This CL removes handoff related UI and implements phoneAccountClicked Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633 --- InCallUI/res/drawable-hdpi/ic_in_call_pstn.png | Bin 4997 -> 0 bytes InCallUI/res/drawable-hdpi/ic_in_call_wifi.png | Bin 3065 -> 0 bytes InCallUI/res/drawable-mdpi/ic_in_call_pstn.png | Bin 4997 -> 0 bytes InCallUI/res/drawable-mdpi/ic_in_call_wifi.png | Bin 3065 -> 0 bytes InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png | Bin 4997 -> 0 bytes InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png | Bin 3065 -> 0 bytes InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png | Bin 4997 -> 0 bytes InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png | Bin 3065 -> 0 bytes .../floating_handoff_button_active_background.xml | 28 ----------- ...floating_handoff_button_compound_background.xml | 24 ---------- ...floating_handoff_button_disabled_background.xml | 28 ----------- .../floating_handoff_button_pressed_background.xml | 28 ----------- InCallUI/res/layout/call_card.xml | 15 ------ InCallUI/res/layout/primary_call_info.xml | 5 +- InCallUI/res/layout/secondary_call_info.xml | 3 +- InCallUI/res/values/colors.xml | 12 ----- InCallUI/res/values/strings.xml | 8 ---- InCallUI/src/com/android/incallui/Call.java | 13 ------ .../src/com/android/incallui/CallCardFragment.java | 52 +++++++-------------- .../com/android/incallui/CallCardPresenter.java | 51 ++++---------------- .../com/android/incallui/InCallServiceImpl.java | 1 - .../src/com/android/incallui/TelecommAdapter.java | 6 +-- 22 files changed, 32 insertions(+), 242 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/ic_in_call_pstn.png delete mode 100644 InCallUI/res/drawable-hdpi/ic_in_call_wifi.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_in_call_pstn.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_in_call_wifi.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png delete mode 100644 InCallUI/res/drawable/floating_handoff_button_active_background.xml delete mode 100644 InCallUI/res/drawable/floating_handoff_button_compound_background.xml delete mode 100644 InCallUI/res/drawable/floating_handoff_button_disabled_background.xml delete mode 100644 InCallUI/res/drawable/floating_handoff_button_pressed_background.xml diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-hdpi/ic_in_call_pstn.png deleted file mode 100644 index 3a52a2bbd..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_in_call_pstn.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png deleted file mode 100644 index 4fd5f333c..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-mdpi/ic_in_call_pstn.png deleted file mode 100644 index 3a52a2bbd..000000000 Binary files a/InCallUI/res/drawable-mdpi/ic_in_call_pstn.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png deleted file mode 100644 index 4fd5f333c..000000000 Binary files a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png deleted file mode 100644 index 3a52a2bbd..000000000 Binary files a/InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png deleted file mode 100644 index 4fd5f333c..000000000 Binary files a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png deleted file mode 100644 index 3a52a2bbd..000000000 Binary files a/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png deleted file mode 100644 index 4fd5f333c..000000000 Binary files a/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png and /dev/null differ diff --git a/InCallUI/res/drawable/floating_handoff_button_active_background.xml b/InCallUI/res/drawable/floating_handoff_button_active_background.xml deleted file mode 100644 index f06e8416b..000000000 --- a/InCallUI/res/drawable/floating_handoff_button_active_background.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/InCallUI/res/drawable/floating_handoff_button_compound_background.xml b/InCallUI/res/drawable/floating_handoff_button_compound_background.xml deleted file mode 100644 index 00ee7913a..000000000 --- a/InCallUI/res/drawable/floating_handoff_button_compound_background.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - diff --git a/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml deleted file mode 100644 index 68d64b8e0..000000000 --- a/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml b/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml deleted file mode 100644 index 54a046973..000000000 --- a/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml index 820397d52..e0810659c 100644 --- a/InCallUI/res/layout/call_card.xml +++ b/InCallUI/res/layout/call_card.xml @@ -54,21 +54,6 @@ - - - - - - diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index 4cd04f353..bbb79722d 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -33,7 +33,7 @@ android:animateLayoutChanges="true" android:gravity="center"> - + android:visibility="gone" /> + android:scaleType="centerInside" /> #dddddd - - #F2882C - - - #F2A35E - - - #303030 - - #19E392 - #33A9F2 - #000000 diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 4bcd5c09d..6beeff561 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -498,11 +498,6 @@ Emergency number - Connected via %s - - - WiFi - 0 @@ -552,7 +547,4 @@ - - - Handoff diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 22cc18234..b82e938b5 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -111,7 +111,6 @@ public final class Call { private GatewayInfo mGatewayInfo; private PhoneAccount mAccount; private CallServiceDescriptor mCurrentCallServiceDescriptor; - private CallServiceDescriptor mHandoffCallServiceDescriptor; private RemoteCallVideoProvider mCallVideoProvider; private String mParentCallId; private List mChildCallIds; @@ -239,18 +238,6 @@ public final class Call { mCurrentCallServiceDescriptor = descriptor; } - /** - * The descriptor for the call service that this call is being switched to, null if handoff is - * not in progress. - */ - public CallServiceDescriptor getHandoffCallServiceDescriptor() { - return mHandoffCallServiceDescriptor; - } - - public void setHandoffCallServiceDescriptor(CallServiceDescriptor descriptor) { - mHandoffCallServiceDescriptor = descriptor; - } - public RemoteCallVideoProvider getCallVideoProvider() { return mCallVideoProvider; } diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 701622044..aef9991f7 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -63,6 +63,7 @@ public class CallCardFragment extends BaseFragment private CallTimer mCallTimer; private Context mContext; - private boolean mIsWiFiCachedValue; - public CallCardPresenter() { // create the call timer mCallTimer = new CallTimer(new Runnable() { @@ -189,19 +187,11 @@ public class CallCardPresenter extends Presenter callState = mPrimary.getState(); final boolean bluetoothOn = (AudioModeProvider.getInstance().getAudioMode() == AudioMode.BLUETOOTH); - boolean isHandoffCapable = isHandoffCapable(); - boolean isHandoffPending = isHandoffPending(); - - boolean isWiFi = isWifiCall(); - // Cache the value so the UI doesn't change when the call ends. - mIsWiFiCachedValue = isWiFi; getUi().setCallState(callState, mPrimary.getDisconnectCause(), bluetoothOn, - getConnectionLabel(), getConnectionIcon(), getGatewayNumber(), isWiFi, - isHandoffCapable, isHandoffPending); + getConnectionLabel(), getConnectionIcon(), getGatewayNumber()); } else { - getUi().setCallState(callState, DisconnectCause.NOT_VALID, false, null, null, null, - mIsWiFiCachedValue, false, false); + getUi().setCallState(callState, DisconnectCause.NOT_VALID, false, null, null, null); } final boolean enableEndCallButton = Call.State.isConnected(callState) && @@ -215,25 +205,10 @@ public class CallCardPresenter extends Presenter final boolean bluetoothOn = (AudioMode.BLUETOOTH == mode); getUi().setCallState(mPrimary.getState(), mPrimary.getDisconnectCause(), bluetoothOn, - getConnectionLabel(), getConnectionIcon(), getGatewayNumber(), isWifiCall(), - isHandoffCapable(), isHandoffPending()); + getConnectionLabel(), getConnectionIcon(), getGatewayNumber()); } } - private boolean isWifiCall() { - CallServiceDescriptor descriptor = mPrimary.getCurrentCallServiceDescriptor(); - return descriptor != null && - descriptor.getNetworkType() == CallServiceDescriptor.FLAG_WIFI; - } - - private boolean isHandoffCapable() { - return mPrimary.can(CallCapabilities.CONNECTION_HANDOFF); - } - - private boolean isHandoffPending() { - return mPrimary.getHandoffCallServiceDescriptor() != null; - } - @Override public void onSupportedAudioMode(int mask) { } @@ -257,12 +232,11 @@ public class CallCardPresenter extends Presenter } } - public void connectionHandoffClicked() { + public void phoneAccountClicked() { if (mPrimary == null) { return; } - - TelecommAdapter.getInstance().handoffCall(mPrimary.getCallId()); + TelecommAdapter.getInstance().phoneAccountClicked(mPrimary.getCallId()); } private boolean areCallsSame(Call call1, Call call2) { @@ -437,9 +411,6 @@ public class CallCardPresenter extends Presenter * Return the Drawable object of the icon to display to the left of the connection label. */ private Drawable getConnectionIcon() { - if (mIsWiFiCachedValue == true) { - return mContext.getResources().getDrawable(R.drawable.ic_in_call_wifi); - } PhoneAccount account = mPrimary.getAccount(); if (account != null) { return account.getIcon(mContext); @@ -449,7 +420,7 @@ public class CallCardPresenter extends Presenter /** * Returns the label (line of text above the number/name) for any given call. - * For example, "calling via [Account/Google Voice/Wifi]" for outgoing calls. + * For example, "calling via [Account/Google Voice]" for outgoing calls. */ private String getConnectionLabel() { if (hasOutgoingGatewayCall() && getUi() != null) { @@ -465,11 +436,8 @@ public class CallCardPresenter extends Presenter } } PhoneAccount account = mPrimary.getAccount(); - if (mIsWiFiCachedValue == true || account != null) { - // Label will be either account name or WiFi connection - // TODO: get the name of the wifi connection - String wifiString = mContext.getString(R.string.wifi_constant); - return account == null? wifiString : account.getLabel(mContext); + if (account != null) { + return account.getLabel(mContext); } return null; } @@ -552,8 +520,7 @@ public class CallCardPresenter extends Presenter String providerLabel, Drawable providerIcon, boolean isConference, boolean isGeneric); void setCallState(int state, int cause, boolean bluetoothOn, String connectionLabel, - Drawable connectionIcon, String gatewayNumber, boolean isWifi, - boolean isHandoffCapable, boolean isHandoffPending); + Drawable connectionIcon, String gatewayNumber); void setPrimaryCallElapsedTime(boolean show, String duration); void setPrimaryName(String name, boolean nameIsNumber); void setPrimaryImage(Drawable image); diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java index c12920886..123e981b1 100644 --- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java +++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java @@ -126,7 +126,6 @@ public class InCallServiceImpl extends InCallService { call.setGatewayInfo(telecommCall.getGatewayInfo()); call.setAccount(telecommCall.getAccount()); call.setCurrentCallServiceDescriptor(telecommCall.getCurrentCallServiceDescriptor()); - call.setHandoffCallServiceDescriptor(telecommCall.getHandoffCallServiceDescriptor()); call.setState(translateState(telecommCall.getState())); call.setParentId(telecommCall.getParentCallId()); call.setChildCallIds(telecommCall.getChildCallIds()); diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java index 1b50c034f..620a9bd99 100644 --- a/InCallUI/src/com/android/incallui/TelecommAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java @@ -172,11 +172,11 @@ final class TelecommAdapter { } } - void handoffCall(String callId) { + void phoneAccountClicked(String callId) { if (mAdapter != null) { - mAdapter.handoffCall(callId); + mAdapter.phoneAccountClicked(callId); } else { - Log.e(this, "error handoffCall, mAdapter is null"); + Log.e(this, "error phoneAccountClicked, mAdapter is null"); } } -- cgit v1.2.3