diff options
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/drawable/btn_compound_audio.xml | 9 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_compound_background.xml | 2 | ||||
-rw-r--r-- | InCallUI/res/layout/call_button_fragment.xml | 14 | ||||
-rw-r--r-- | InCallUI/res/values/strings.xml | 24 | ||||
-rw-r--r-- | InCallUI/res/values/styles.xml | 9 |
5 files changed, 13 insertions, 45 deletions
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml index 222ff1b41..25a64a6ab 100644 --- a/InCallUI/res/drawable/btn_compound_audio.xml +++ b/InCallUI/res/drawable/btn_compound_audio.xml @@ -90,13 +90,4 @@ android:tint="@color/selectable_icon_tint" /> </item> - <!-- Generic "audio mode" icon. --> - <!-- TODO: is this actually needed? --> - <!-- - <item android:id="@+id/soundItem"> - <bitmap android:src="@drawable/ic_sound_holo_dark" - android:gravity="center" /> - </item> - --> - </layer-list> diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml index 36aab0df7..20e2a3056 100644 --- a/InCallUI/res/drawable/btn_compound_background.xml +++ b/InCallUI/res/drawable/btn_compound_background.xml @@ -32,4 +32,4 @@ <item android:drawable="@drawable/btn_unselected" /> </selector> </item> -</ripple>
\ No newline at end of file +</ripple> diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 2ca640368..24101feac 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -67,10 +67,10 @@ <!-- "Audio mode". this is a multi-mode button that can behave either like a simple "compound button" with two states *or* like an action button that brings up a popup menu; see btn_compound_audio.xml and CallButtonFragment.updateAudioButtons(). --> - <ImageButton android:id="@+id/audioButton" + <ToggleButton android:id="@+id/audioButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_audio" - android:contentDescription="@string/onscreenAudioText" /> + android:contentDescription="@string/audio_mode_speaker" /> <!-- "Change to audio call" for video calls. --> <ImageButton android:id="@+id/changeToVoiceButton" @@ -82,7 +82,7 @@ <!-- MIDDLE LEFT SLOT ================================================================== --> <!-- "Mute" --> - <com.android.incallui.CallToggleButton android:id="@+id/muteButton" + <ToggleButton android:id="@+id/muteButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_mute" android:contentDescription="@string/onscreenMuteText" /> @@ -90,7 +90,7 @@ <!-- CENTER SLOT ======================================================================= --> <!-- "Dialpad" --> - <com.android.incallui.CallToggleButton android:id="@+id/dialpadButton" + <ToggleButton android:id="@+id/dialpadButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_dialpad" android:contentDescription="@string/onscreenShowDialpadText" /> @@ -101,7 +101,7 @@ other of these must always be set to GONE. --> <!-- "Hold" --> - <com.android.incallui.CallToggleButton android:id="@+id/holdButton" + <ToggleButton android:id="@+id/holdButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_hold" android:contentDescription="@string/onscreenHoldText" /> @@ -121,7 +121,7 @@ android:visibility="gone" /> <!-- "Switch camera" for video calls. --> - <com.android.incallui.CallToggleButton android:id="@+id/switchCameraButton" + <ToggleButton android:id="@+id/switchCameraButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_video_switch" android:contentDescription="@string/onscreenSwitchCameraText" @@ -149,7 +149,7 @@ android:visibility="gone" /> <!-- "Switch camera" for video calls. --> - <com.android.incallui.CallToggleButton android:id="@+id/pauseVideoButton" + <ToggleButton android:id="@+id/pauseVideoButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_video_off" android:contentDescription="@string/onscreenPauseVideoText" diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 585030def..e8cc64c10 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -336,30 +336,6 @@ <!-- "Custom Message" Send alert dialog button --> <string name="custom_message_send">Send</string> - <!-- String used by AccessibilityService to announce that the speakerphone has been selected for audio output [CHAR LIMIT=NONE]--> - <string name="accessibility_speakerphone_selected">Speakerphone selected</string> - - <!-- String used by AccessibilityService to announce that the phone's earpiece has been selected for audio output [CHAR LIMIT=NONE]--> - <string name="accessibility_earpiece_selected">Earpiece selected</string> - - <!-- String used by AccessibilityService to announce that the wired headset has been selected for audio output [CHAR LIMIT=NONE]--> - <string name="accessibility_wired_headset_selected">Wired headset selected</string> - - <!-- String used by AccessibilityService to announce that the bluetooth headset has been selected for audio output [CHAR LIMIT=NONE]--> - <string name="accessibility_bluetooth_headset_selected">Bluetooth headset selected</string> - - <!-- String used by AccessibilityService to announce that the call has been muted [CHAR LIMIT=NONE]--> - <string name="accessibility_call_muted">Call muted.</string> - - <!-- String used by AccessibilityService to announce that the call has been unmuted [CHAR LIMIT=NONE]--> - <string name="accessibility_call_unmuted">Call unmuted.</string> - - <!-- String used by AccessibilityService to announce that the call has been put on hold [CHAR LIMIT=NONE]--> - <string name="accessibility_call_put_on_hold">Call put on hold.</string> - - <!-- String used by AccessibilityService to announce that the call has been removed from hold [CHAR LIMIT=NONE]--> - <string name="accessibility_call_removed_from_hold">Call no longer on hold.</string> - <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] --> <string name="description_target_answer">Answer</string> <!-- Description of the send_sms target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] --> diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index 9471c183e..e16d72cb4 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -61,11 +61,11 @@ </style> <!-- "Compound button" variation of InCallButton. - These buttons have the concept of two states: checked and unchecked. - (This style is just like "InCallButton" except that we also - clear out android:textOn and android:textOff, to avoid the default - text label behavior of the ToggleButton class.) --> + These buttons have the concept of two states: checked and unchecked. This style is just + like "InCallButton" except that we also clear out android:background, android:textOn, + android:textOff, to avoid the default behavior of the ToggleButton class. --> <style name="InCallCompoundButton" parent="InCallButton"> + <item name="android:background">@null</item> <item name="android:textOn">@null</item> <item name="android:textOff">@null</item> </style> @@ -115,6 +115,7 @@ <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="android:popupMenuStyle">@style/InCallPopupMenuStyle</item> <item name="android:actionBarStyle">@style/InCallActionBarStyle</item> + <item name="android:buttonStyleToggle">@style/InCallCompoundButton</item> </style> <style name="Theme.CircularRevealAnimation" parent="@android:style/Theme.Material.Light"> |