diff options
author | Sailesh Nepal <sail@google.com> | 2014-02-18 20:04:15 -0800 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2014-02-18 20:04:15 -0800 |
commit | 4d611662e17878203be2770142409829c1a2d4e4 (patch) | |
tree | f7a28dea15512fe4aad8dac3781a9e37c85868ff /InCallUI/res | |
parent | 9dc84d13635393508ead9d11b65df692f0c856b0 (diff) |
Revert "Add handoff buttons"
This reverts commit 36b5e5f96678bafc325491d5294b2d97e0a0e499.
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png | bin | 1857 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_in_call_wifi.png | bin | 1789 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png | bin | 1508 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_in_call_wifi.png | bin | 1487 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png | bin | 2180 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png | bin | 2283 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png | bin | 2244 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/layout/call_button_fragment.xml | 14 | ||||
-rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 12 | ||||
-rw-r--r-- | InCallUI/res/values/strings.xml | 6 |
10 files changed, 3 insertions, 29 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index fb76e3c69..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.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 93e086dab..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index 8b1ff4e02..000000000 --- a/InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.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 339d4ed27..000000000 --- a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index 38d6220b1..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.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 692726fbe..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index 4cbdbbb57..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png +++ /dev/null diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 944c3147a..013d1b22a 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -164,19 +164,7 @@ android:visibility="gone" /> - <!-- Separator between 5th and 6th button --> - <View android:id="@+id/videoHandoffSpacer" - style="@style/VerticalSeparator" - android:visibility="gone" /> - - <ImageButton android:id="@+id/videoHandoffButton" - style="@style/InCallButton" - android:src="@drawable/ic_in_call_video_handoff" - android:contentDescription="@string/video_handoff_text" - android:visibility="gone" - /> - - <!-- Separator between last button and right padding --> + <!-- Separator between 4th (or 5th) button and right padding --> <View style="@style/VerticalSeparator"/> </LinearLayout> diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index d3f6db307..d013f7022 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -119,7 +119,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical|right" - android:orientation="horizontal" + android:orientation="vertical" android:background="@color/incall_secondary_info_background" android:animateLayoutChanges="true"> @@ -127,9 +127,8 @@ indication like "Dialing" or "Incoming call" or "Call ended". It's unused for the normal case of an active ongoing call. --> <TextView android:id="@+id/callStateLabel" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:paddingTop="@dimen/provider_info_top_bottom_padding" android:paddingBottom="@dimen/provider_info_top_bottom_padding" android:paddingStart="@dimen/call_banner_side_padding" @@ -141,13 +140,6 @@ android:background="@android:color/transparent" android:singleLine="true" android:ellipsize="end"/> - - <Button android:id="@+id/connectionHandoffButton" - android:text="@string/connection_handoff_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" /> - </LinearLayout> </LinearLayout> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index ddfec2c07..bbcbbe962 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -519,10 +519,4 @@ <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> - - <!-- Text for the onscreen video handoff button --> - <string name="video_handoff_text">Video</string> - - <!-- Text for the onscreen connection handoff button --> - <string name="connection_handoff_text">Handoff</string> </resources> |