diff options
author | Nancy Chen <nancychen@google.com> | 2014-07-11 17:29:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-11 17:04:34 +0000 |
commit | ffe95c5be32c9dbb93e0eae168c18960ac72503a (patch) | |
tree | 0ff43e4b21f27021c85e3790ff0b971b1f7aaa32 /InCallUI | |
parent | 875f3500a284420f00455fe7adf2a9df07f272f0 (diff) | |
parent | a548a7a758928c8c675d93454e6a5c85d8b896cb (diff) |
Merge "Remove bluetooth icon from call state banner and change toolbar carrot"
Diffstat (limited to 'InCallUI')
14 files changed, 8 insertions, 36 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index 554f7e9a7..000000000 --- a/InCallUI/res/drawable-hdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_arrow_whitespace.png b/InCallUI/res/drawable-hdpi/ic_toolbar_arrow_whitespace.png Binary files differnew file mode 100644 index 000000000..ea02daad2 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_arrow_whitespace.png diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index adb18aed0..000000000 --- a/InCallUI/res/drawable-ldrtl-hdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index 2de388f96..000000000 --- a/InCallUI/res/drawable-ldrtl-mdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index 6fe45cd36..000000000 --- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index 27b6d33e9..000000000 --- a/InCallUI/res/drawable-mdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_arrow_whitespace.png b/InCallUI/res/drawable-mdpi/ic_toolbar_arrow_whitespace.png Binary files differnew file mode 100644 index 000000000..c39990deb --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_arrow_whitespace.png diff --git a/InCallUI/res/drawable-xhdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index 3d9897a1b..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_arrow_whitespace.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_arrow_whitespace.png Binary files differnew file mode 100644 index 000000000..cdaa79d37 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_arrow_whitespace.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png Binary files differdeleted file mode 100644 index 42f65499f..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_arrow_whitespace.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_arrow_whitespace.png Binary files differnew file mode 100644 index 000000000..737704018 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_arrow_whitespace.png diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml index adfb8c279..ae4a2de4d 100644 --- a/InCallUI/res/drawable/btn_compound_audio.xml +++ b/InCallUI/res/drawable/btn_compound_audio.xml @@ -45,7 +45,7 @@ <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> <item android:id="@+id/moreIndicatorItem"> - <bitmap android:src="@drawable/ic_more_indicator_holo_dark" + <bitmap android:src="@drawable/ic_toolbar_arrow_whitespace" android:gravity="center" android:tint="@color/selectable_icon_tint" /> </item> diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index aef9991f7..abc53ae17 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -322,15 +322,14 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } @Override - public void setCallState(int state, int cause, boolean bluetoothOn, String connectionLabel, - Drawable connectionIcon, String gatewayNumber) { + public void setCallState(int state, int cause, String connectionLabel, Drawable connectionIcon, + String gatewayNumber) { boolean isGatewayCall = !TextUtils.isEmpty(gatewayNumber); String callStateLabel = getCallStateLabelFromState( state, cause, connectionLabel, isGatewayCall); Log.v(this, "setCallState " + callStateLabel); Log.v(this, "DisconnectCause " + DisconnectCause.toString(cause)); - Log.v(this, "bluetooth on " + bluetoothOn); Log.v(this, "gateway " + connectionLabel + gatewayNumber); // Update the call state label and icon. @@ -359,10 +358,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mCallStateLabel.setAlpha(0); mCallStateLabel.setVisibility(View.GONE); } - - if (Call.State.INCOMING == state) { - setBluetoothOn(bluetoothOn); - } } private void showInternetCallLabel(boolean show) { @@ -416,21 +411,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr return getView().getResources().getDrawable(resId); } - private void setBluetoothOn(boolean onOff) { - // Also, display a special icon (alongside the "Incoming call" - // label) if there's an incoming call and audio will be routed - // to bluetooth when you answer it. - final int bluetoothIconId = R.drawable.ic_in_call_bt_dk; - - if (onOff) { - mCallStateLabel.setCompoundDrawablesWithIntrinsicBounds(bluetoothIconId, 0, 0, 0); - mCallStateLabel.setCompoundDrawablePadding((int) (mDensity * 5)); - } else { - // Clear out any icons - mCallStateLabel.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - } - } - /** * Gets the call state label based on the state of the call and * cause of disconnect diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 9a233f533..9993ffbc4 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -185,13 +185,11 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> int callState = Call.State.IDLE; if (mPrimary != null) { callState = mPrimary.getState(); - final boolean bluetoothOn = - (AudioModeProvider.getInstance().getAudioMode() == AudioMode.BLUETOOTH); - getUi().setCallState(callState, mPrimary.getDisconnectCause(), bluetoothOn, - getConnectionLabel(), getConnectionIcon(), getGatewayNumber()); + getUi().setCallState(callState, mPrimary.getDisconnectCause(), getConnectionLabel(), + getConnectionIcon(), getGatewayNumber()); } else { - getUi().setCallState(callState, DisconnectCause.NOT_VALID, false, null, null, null); + getUi().setCallState(callState, DisconnectCause.NOT_VALID, null, null, null); } final boolean enableEndCallButton = Call.State.isConnected(callState) && @@ -201,12 +199,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> @Override public void onAudioMode(int mode) { - if (mPrimary != null && getUi() != null) { - final boolean bluetoothOn = (AudioMode.BLUETOOTH == mode); - - getUi().setCallState(mPrimary.getState(), mPrimary.getDisconnectCause(), bluetoothOn, - getConnectionLabel(), getConnectionIcon(), getGatewayNumber()); - } } @Override @@ -519,8 +511,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> void setSecondary(boolean show, String name, boolean nameIsNumber, String label, String providerLabel, Drawable providerIcon, boolean isConference, boolean isGeneric); - void setCallState(int state, int cause, boolean bluetoothOn, String connectionLabel, - Drawable connectionIcon, String gatewayNumber); + void setCallState(int state, int cause, String connectionLabel, Drawable connectionIcon, + String gatewayNumber); void setPrimaryCallElapsedTime(boolean show, String duration); void setPrimaryName(String name, boolean nameIsNumber); void setPrimaryImage(Drawable image); |