diff options
21 files changed, 17 insertions, 94 deletions
diff --git a/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png Binary files differdeleted file mode 100644 index f4a08bea..00000000 --- a/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/list_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png Binary files differdeleted file mode 100644 index 516f5c73..00000000 --- a/res/drawable-hdpi/list_focused_holo.9.png +++ /dev/null diff --git a/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index c8afb46f..00000000 --- a/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png Binary files differdeleted file mode 100644 index 6ff8e484..00000000 --- a/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/list_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png Binary files differdeleted file mode 100644 index 7c0599e3..00000000 --- a/res/drawable-mdpi/list_focused_holo.9.png +++ /dev/null diff --git a/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index c9002b7a..00000000 --- a/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png Binary files differdeleted file mode 100644 index 0211d69b..00000000 --- a/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png Binary files differdeleted file mode 100644 index 690cb1eb..00000000 --- a/res/drawable-xhdpi/list_focused_holo.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index 88726b69..00000000 --- a/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png Binary files differdeleted file mode 100644 index 26a22baa..00000000 --- a/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png +++ /dev/null diff --git a/res/drawable-xxhdpi/list_focused_holo.9.png b/res/drawable-xxhdpi/list_focused_holo.9.png Binary files differdeleted file mode 100644 index 3e4ca684..00000000 --- a/res/drawable-xxhdpi/list_focused_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index 26234b1e..00000000 --- a/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png +++ /dev/null diff --git a/res/drawable/btn_compound_audio.xml b/res/drawable/btn_compound_audio.xml index 5d364942..c348c98c 100644 --- a/res/drawable/btn_compound_audio.xml +++ b/res/drawable/btn_compound_audio.xml @@ -37,7 +37,7 @@ (In states where the audio button *not* a toggle, we explicitly hide this layer.) --> <item android:id="@+id/compoundBackgroundItem" - android:drawable="@drawable/btn_fake_compound_background" /> + android:drawable="@drawable/btn_compound_background" /> <!-- The little triangle that indicates that this isn't a plain button, but will instead pop up a menu. This layer is *not* diff --git a/res/drawable/btn_compound_background.xml b/res/drawable/btn_compound_background.xml index 6f2ef5f1..5af7cca7 100644 --- a/res/drawable/btn_compound_background.xml +++ b/res/drawable/btn_compound_background.xml @@ -20,15 +20,14 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" - android:drawable="@drawable/list_pressed_holo_dark" /> - <item android:state_checked="true" android:state_focused="true" - android:drawable="@drawable/list_selector_focused_and_checked" /> + android:drawable="@color/tab_pressed_color" /> + <item android:state_selected="true" android:state_focused="true" + android:drawable="@drawable/tab_selected_focused" /> <item android:state_focused="true" - android:drawable="@drawable/list_focused_holo" /> - <item android:state_checked="true" - android:drawable="@drawable/ic_active_state_dialer_holo_dark" /> + android:drawable="@drawable/tab_unselected_focused" /> + <item android:state_selected="true" + android:drawable="@drawable/tab_selected" /> - <item - android:drawable="@android:color/transparent" /> + <item android:drawable="@android:color/transparent" /> </selector> diff --git a/res/drawable/btn_fake_compound_hold.xml b/res/drawable/btn_compound_hold.xml index 04bdd944..50161eac 100644 --- a/res/drawable/btn_fake_compound_hold.xml +++ b/res/drawable/btn_compound_hold.xml @@ -18,7 +18,7 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <!-- The standard "compound button" background. --> - <item android:drawable="@drawable/btn_fake_compound_background" /> + <item android:drawable="@drawable/btn_compound_background" /> <!-- ...and the actual icon on top. Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> diff --git a/res/drawable/btn_fake_compound_mute.xml b/res/drawable/btn_compound_mute.xml index 69048a27..4e09bd9c 100644 --- a/res/drawable/btn_fake_compound_mute.xml +++ b/res/drawable/btn_compound_mute.xml @@ -18,7 +18,7 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <!-- The standard "compound button" background. --> - <item android:drawable="@drawable/btn_fake_compound_background" /> + <item android:drawable="@drawable/btn_compound_background" /> <!-- ...and the actual icon on top. Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> diff --git a/res/drawable/btn_fake_compound_background.xml b/res/drawable/btn_fake_compound_background.xml deleted file mode 100644 index 197f589d..00000000 --- a/res/drawable/btn_fake_compound_background.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- Background resource for "compound buttons" in the in-call UI. - These buttons have two states (checked and unchecked), and - show a blue bar along the bottom edge when checked. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_pressed="true" android:state_selected="true" - android:drawable="@drawable/list_selector_selected_and_pressed" /> - <item android:state_pressed="true" - android:drawable="@drawable/list_pressed_holo_dark" /> - <item android:state_selected="true" android:state_focused="true" - android:drawable="@drawable/list_selector_focused_and_checked" /> - <item android:state_focused="true" - android:drawable="@drawable/list_focused_holo" /> - <item android:state_selected="true" - android:drawable="@drawable/ic_active_state_dialer_holo_dark" /> - - <item - android:drawable="@android:color/transparent" /> - -</selector>
\ No newline at end of file diff --git a/res/drawable/list_selector_focused_and_checked.xml b/res/drawable/list_selector_focused_and_checked.xml deleted file mode 100644 index 113dae82..00000000 --- a/res/drawable/list_selector_focused_and_checked.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item android:drawable="@drawable/ic_active_state_dialer_holo_dark" /> - <item android:drawable="@drawable/list_focused_holo" /> -</layer-list> diff --git a/res/drawable/list_selector_selected_and_pressed.xml b/res/drawable/list_selector_selected_and_pressed.xml deleted file mode 100644 index d81ee36e..00000000 --- a/res/drawable/list_selector_selected_and_pressed.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item android:drawable="@drawable/ic_active_state_dialer_holo_dark" /> - <item android:drawable="@drawable/list_pressed_holo_dark" /> -</layer-list>
\ No newline at end of file diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml index 9d8f743d..3cfd87f3 100644 --- a/res/layout/call_button_fragment.xml +++ b/res/layout/call_button_fragment.xml @@ -79,7 +79,7 @@ <!-- "Dialpad" --> <!-- This is a "compound button": it has checked and unchecked states. --> - <ToggleButton android:id="@+id/dialpadButton" + <ImageButton android:id="@+id/dialpadButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_dialpad" android:contentDescription="@string/onscreenShowDialpadText" /> @@ -105,7 +105,7 @@ <!-- This is a "compound button": it has checked and unchecked states. --> <ImageButton android:id="@+id/muteButton" style="@style/InCallButton" - android:background="@drawable/btn_fake_compound_mute" + android:background="@drawable/btn_compound_mute" android:contentDescription="@string/onscreenMuteText" /> <!-- Separator between 3rd and 4th button --> @@ -118,7 +118,7 @@ <!-- This is a "compound button": it has checked and unchecked states. --> <ImageButton android:id="@+id/holdButton" style="@style/InCallButton" - android:background="@drawable/btn_fake_compound_hold" + android:background="@drawable/btn_compound_hold" android:contentDescription="@string/onscreenHoldText" /> <!-- "Swap" (or "Manage calls" in some CDMA states) --> diff --git a/src/com/android/incallui/CallButtonFragment.java b/src/com/android/incallui/CallButtonFragment.java index 58cb6d87..2912ecef 100644 --- a/src/com/android/incallui/CallButtonFragment.java +++ b/src/com/android/incallui/CallButtonFragment.java @@ -45,7 +45,7 @@ public class CallButtonFragment private ImageButton mMuteButton; private ImageButton mAudioButton; private ImageButton mHoldButton; - private ToggleButton mShowDialpadButton; + private ImageButton mShowDialpadButton; private ImageButton mMergeButton; private ImageButton mAddCallButton; private ImageButton mSwapButton; @@ -123,7 +123,7 @@ public class CallButtonFragment } }); - mShowDialpadButton = (ToggleButton) parent.findViewById(R.id.dialpadButton); + mShowDialpadButton = (ImageButton) parent.findViewById(R.id.dialpadButton); mShowDialpadButton.setOnClickListener(this); mAddCallButton = (ImageButton) parent.findViewById(R.id.addButton); mAddCallButton.setOnClickListener(this); @@ -174,7 +174,7 @@ public class CallButtonFragment getPresenter().swapClicked(); break; case R.id.dialpadButton: - getPresenter().showDialpadClicked(mShowDialpadButton.isChecked()); + getPresenter().showDialpadClicked(!mShowDialpadButton.isSelected()); break; case R.id.auxiliaryActionButton: getPresenter().auxiliaryActionButtonClicked(); @@ -498,7 +498,7 @@ public class CallButtonFragment @Override public void displayDialpad(boolean value) { - mShowDialpadButton.setChecked(value); + mShowDialpadButton.setSelected(value); if (getActivity() != null && getActivity() instanceof InCallActivity) { ((InCallActivity) getActivity()).displayDialpad(value); } |
