summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSailesh Nepal <sail@google.com>2014-07-02 21:38:08 -0700
committerSailesh Nepal <sail@google.com>2014-07-02 21:51:59 -0700
commit6d0f6679a1afb1afa3053bd9511aea8f5945a5d7 (patch)
tree3ce0f07d4505f6b8aae0bc062cd80b8b1ea39ae8 /res/layout
parent3d2abe4e8f5b45c501fee0dde147d74242aa5bb1 (diff)
downloadpackages_apps_InCallUI-6d0f6679a1afb1afa3053bd9511aea8f5945a5d7.tar.gz
packages_apps_InCallUI-6d0f6679a1afb1afa3053bd9511aea8f5945a5d7.tar.bz2
packages_apps_InCallUI-6d0f6679a1afb1afa3053bd9511aea8f5945a5d7.zip
Remove handoff UI
This CL removes handoff related UI and implements phoneAccountClicked Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/call_card.xml15
-rw-r--r--res/layout/primary_call_info.xml5
-rw-r--r--res/layout/secondary_call_info.xml3
3 files changed, 3 insertions, 20 deletions
diff --git a/res/layout/call_card.xml b/res/layout/call_card.xml
index 820397d5..e0810659 100644
--- a/res/layout/call_card.xml
+++ b/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/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index 4cd04f35..bbb79722 100644
--- a/res/layout/primary_call_info.xml
+++ b/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/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml
index 9382cfe3..c562ae29 100644
--- a/res/layout/secondary_call_info.xml
+++ b/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"