diff options
author | Sailesh Nepal <sail@google.com> | 2014-07-02 21:38:08 -0700 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2014-07-02 21:51:59 -0700 |
commit | f8b0677bed382046cb26e38a8442a9509d1e835c (patch) | |
tree | 5ddf807dace10229d21e8e8bdcb429ea7d565bf3 /InCallUI/res | |
parent | df22018185375d2de96673ee8f16d1520283d662 (diff) |
Remove handoff UI
This CL removes handoff related UI and implements
phoneAccountClicked
Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633
Diffstat (limited to 'InCallUI/res')
17 files changed, 3 insertions, 148 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-hdpi/ic_in_call_pstn.png Binary files differdeleted file mode 100644 index 3a52a2bbd..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_pstn.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 4fd5f333c..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-mdpi/ic_in_call_pstn.png Binary files differdeleted file mode 100644 index 3a52a2bbd..000000000 --- a/InCallUI/res/drawable-mdpi/ic_in_call_pstn.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 4fd5f333c..000000000 --- a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png Binary files differdeleted file mode 100644 index 3a52a2bbd..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_in_call_pstn.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 4fd5f333c..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png Binary files differdeleted file mode 100644 index 3a52a2bbd..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 4fd5f333c..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png +++ /dev/null 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" > - <corners - android:radius="@dimen/floating_action_button_radius" /> - <size - android:width="@dimen/floating_action_button_width" - android:height="@dimen/floating_action_button_height" /> - <solid - android:color="@color/handoff_call_active_color" /> -</shape> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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 drawable used to render the floating circular "end call" button. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" - android:drawable="@drawable/floating_handoff_button_disabled_background" /> - <item android:state_pressed="true" - android:drawable="@drawable/floating_handoff_button_pressed_background" /> - <item android:drawable="@drawable/floating_handoff_button_active_background" /> -</selector> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" > - <corners - android:radius="@dimen/floating_action_button_radius" /> - <size - android:width="@dimen/floating_action_button_width" - android:height="@dimen/floating_action_button_height" /> - <solid - android:color="@color/handoff_call_disabled_color" /> -</shape> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" > - <corners - android:radius="@dimen/floating_action_button_radius" /> - <size - android:width="@dimen/floating_action_button_width" - android:height="@dimen/floating_action_button_height" /> - <solid - android:color="@color/handoff_call_pressed_color" /> -</shape> 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 @@ </FrameLayout> - <!-- Insert a CallService indicator (which controls handoff, too) --> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/end_call_button_margin_bottom" - android:layout_gravity="bottom|right"> - - <ImageButton android:id="@+id/handoffButton" - android:enabled="false" - android:layout_width="@dimen/floating_action_button_width" - android:layout_height="@dimen/floating_action_button_height" - android:background="@drawable/floating_handoff_button_compound_background" - android:src="@drawable/ic_in_call_pstn" /> - </FrameLayout> - </FrameLayout> </LinearLayout> 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"> - <LinearLayout + <LinearLayout android:id="@+id/callStateButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -48,8 +48,7 @@ android:baselineAlignBottom="true" android:tint="@color/incall_accent_color" android:scaleType="centerInside" - android:visibility="gone" - android:src="@drawable/ic_in_call_wifi"/> + android:visibility="gone" /> <TextView android:id="@+id/callStateLabel" android:layout_width="match_parent" diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml index 9382cfe31..c562ae292 100644 --- a/InCallUI/res/layout/secondary_call_info.xml +++ b/InCallUI/res/layout/secondary_call_info.xml @@ -52,8 +52,7 @@ android:layout_height="@dimen/call_provider_small_icon_size" android:layout_marginRight="2dp" android:baselineAlignBottom="true" - android:scaleType="centerInside" - android:src="@drawable/ic_in_call_wifi"/> + android:scaleType="centerInside" /> <TextView android:id="@+id/secondaryCallProviderLabel" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index e2eeceaea..a40921d8d 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -39,18 +39,6 @@ <color name="end_call_touch_feedback_tint">#dddddd</color> - <!-- Used when the Handoff Call button is active --> - <color name="handoff_call_active_color">#F2882C</color> - - <!-- Used when the Handoff Call button is pressed --> - <color name="handoff_call_pressed_color">#F2A35E</color> - - <!-- Used when the Handoff Call button is disabled --> - <color name="handoff_call_disabled_color">#303030</color> - - <color name="call_state_wifi">#19E392</color> - <color name="call_state_cellular">#33A9F2</color> - <!-- Color of dialpad digits --> <color name="dialpad_digits_text_color">#000000</color> 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 @@ <!-- This can be used in any application wanting to disable the text "Emergency number" --> <string name="emergency_call_dialog_number_for_display">Emergency number</string> - <string name="in_call_wifi_connected">Connected via <xliff:g id="wifi_ssid">%s</xliff:g></string> - - <!-- Filler string to display as the provider in WiFi calling cases --> - <string name="wifi_constant">WiFi</string> - <!-- The digit to be displayed on the 0 key of the dialpad [CHAR LIMIT=1]--> <string name="dialpad_0_number">0</string> <!-- The digit to be displayed on the 1 key of the dialpad [CHAR LIMIT=1]--> @@ -552,7 +547,4 @@ <string name="dialpad_star_letters"></string> <!-- Do not translate. --> <string name="dialpad_pound_letters"></string> - - <!-- Text for the onscreen connection handoff button --> - <string name="connection_handoff_text">Handoff</string> </resources> |