diff options
| -rw-r--r-- | res/drawable-hdpi/ic_switch_video_holo_dark.png | bin | 1233 -> 369 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_switch_video_holo_dark.png | bin | 1233 -> 279 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_switch_video_holo_dark.png | bin | 1233 -> 410 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_add_group_holo_dark.png | bin | 0 -> 1662 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_switch_video_holo_dark.png | bin | 0 -> 623 bytes | |||
| -rw-r--r-- | res/layout/call_button_fragment.xml | 18 | ||||
| -rw-r--r-- | src/com/android/incallui/CallButtonFragment.java | 6 |
7 files changed, 11 insertions, 13 deletions
diff --git a/res/drawable-hdpi/ic_switch_video_holo_dark.png b/res/drawable-hdpi/ic_switch_video_holo_dark.png Binary files differindex 8488819f..51ccce5f 100644 --- a/res/drawable-hdpi/ic_switch_video_holo_dark.png +++ b/res/drawable-hdpi/ic_switch_video_holo_dark.png diff --git a/res/drawable-mdpi/ic_switch_video_holo_dark.png b/res/drawable-mdpi/ic_switch_video_holo_dark.png Binary files differindex 8488819f..a98ab504 100644 --- a/res/drawable-mdpi/ic_switch_video_holo_dark.png +++ b/res/drawable-mdpi/ic_switch_video_holo_dark.png diff --git a/res/drawable-xhdpi/ic_switch_video_holo_dark.png b/res/drawable-xhdpi/ic_switch_video_holo_dark.png Binary files differindex 8488819f..11eff700 100644 --- a/res/drawable-xhdpi/ic_switch_video_holo_dark.png +++ b/res/drawable-xhdpi/ic_switch_video_holo_dark.png diff --git a/res/drawable-xxhdpi/ic_add_group_holo_dark.png b/res/drawable-xxhdpi/ic_add_group_holo_dark.png Binary files differnew file mode 100644 index 00000000..6497f686 --- /dev/null +++ b/res/drawable-xxhdpi/ic_add_group_holo_dark.png diff --git a/res/drawable-xxhdpi/ic_switch_video_holo_dark.png b/res/drawable-xxhdpi/ic_switch_video_holo_dark.png Binary files differnew file mode 100644 index 00000000..a4d4c87e --- /dev/null +++ b/res/drawable-xxhdpi/ic_switch_video_holo_dark.png diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml index 5fa170a9..ef9beb5c 100644 --- a/res/layout/call_button_fragment.xml +++ b/res/layout/call_button_fragment.xml @@ -182,20 +182,20 @@ <!-- Separator between 5th (or 6th) button and right padding --> <View style="@style/VerticalSeparator" /> - <ImageButton - android:id="@+id/addParticipant" - style="@style/InCallButton" - android:background="@drawable/ic_add_group_holo_dark" - android:contentDescription="@string/onscreenAddParticipant" /> + <ImageButton android:id="@+id/addParticipant" + style="@style/InCallButton" + android:src="@drawable/ic_add_group_holo_dark" + android:contentDescription="@string/onscreenAddParticipant" + /> <!-- Separator between 5th (or 6th) button and right padding --> <View style="@style/VerticalSeparator" /> - <Button android:id="@+id/modifyCallButton" - style="@style/InCallButton" - android:background="@drawable/btn_compound_vt" - android:contentDescription="@string/onscreenModifyCallText" + <ImageButton android:id="@+id/modifyCallButton" + style="@style/InCallButton" + android:src="@drawable/ic_switch_video_holo_dark" + android:contentDescription="@string/onscreenModifyCallText" /> <!-- Separator between 4th (or 5th) button and right padding --> diff --git a/src/com/android/incallui/CallButtonFragment.java b/src/com/android/incallui/CallButtonFragment.java index 21489d0a..a5f3c837 100644 --- a/src/com/android/incallui/CallButtonFragment.java +++ b/src/com/android/incallui/CallButtonFragment.java @@ -28,7 +28,6 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.widget.Button; import android.widget.CompoundButton; import android.widget.ImageButton; import android.widget.PopupMenu; @@ -56,6 +55,7 @@ public class CallButtonFragment private ImageButton mSwapButton; private ImageButton mBlacklistButton; private ImageButton mAddParticipantButton; + private ImageButton mModifyCallButton; private PopupMenu mAudioModePopup; private boolean mAudioModePopupVisible; @@ -64,8 +64,6 @@ public class CallButtonFragment private View mManageConferenceButton; private View mGenericMergeButton; - private Button mModifyCallButton; - @Override CallButtonPresenter createPresenter() { // TODO: find a cleaner way to include audio mode provider than @@ -163,7 +161,7 @@ public class CallButtonFragment mBlacklistButton.setVisibility(View.GONE); } - mModifyCallButton = (Button) parent.findViewById(R.id.modifyCallButton); + mModifyCallButton = (ImageButton) parent.findViewById(R.id.modifyCallButton); mModifyCallButton.setOnClickListener(this); return parent; |
