diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-22 23:40:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 23:40:13 +0000 |
commit | 5ef89ed01f89a78c28b09b4d4a218c6a47a9d03e (patch) | |
tree | 6382f0f70c940ab3ad8d1f6bd8ebb1a0ef9d216d /InCallUI/res | |
parent | 0ada5e932a809d0e90ec4bf16db28738971cbdc8 (diff) | |
parent | 79858d44ebdf946712a801988a827d46d7f7cbe8 (diff) |
Merge "Remove generic call merge button." into lmp-dev
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/layout-land/call_card_content.xml | 3 | ||||
-rw-r--r-- | InCallUI/res/layout/call_card_content.xml | 5 | ||||
-rw-r--r-- | InCallUI/res/layout/extra_button_row.xml | 24 | ||||
-rw-r--r-- | InCallUI/res/layout/secondary_call_info.xml | 2 | ||||
-rw-r--r-- | InCallUI/res/values/colors.xml | 2 |
5 files changed, 6 insertions, 30 deletions
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml index b1b527505..f3173532f 100644 --- a/InCallUI/res/layout-land/call_card_content.xml +++ b/InCallUI/res/layout-land/call_card_content.xml @@ -43,12 +43,15 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" > + <!-- Secondary "Call info" block, for the background ("on hold") call. --> <include layout="@layout/secondary_call_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" /> + </FrameLayout> + </LinearLayout> <!-- Contact photo for primary call info --> diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml index 605d6300f..c45553f6d 100644 --- a/InCallUI/res/layout/call_card_content.xml +++ b/InCallUI/res/layout/call_card_content.xml @@ -96,10 +96,7 @@ </FrameLayout> <!-- Secondary "Call info" block, for the background ("on hold") call. --> - <include layout="@layout/secondary_call_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true"/> + <include layout="@layout/secondary_call_info" /> <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. --> <FrameLayout diff --git a/InCallUI/res/layout/extra_button_row.xml b/InCallUI/res/layout/extra_button_row.xml index 1bff4c550..417c4d6b9 100644 --- a/InCallUI/res/layout/extra_button_row.xml +++ b/InCallUI/res/layout/extra_button_row.xml @@ -46,28 +46,4 @@ android:text="@string/onscreenManageConferenceText" /> </LinearLayout> - <!-- CDMA-specific "Merge" --> - <!-- This button is used only on CDMA devices, where we can't use - the Merge button in the main button row (because the "Add Call" - button might need to be enabled at the same time.) --> - <LinearLayout android:id="@+id/cdmaMergeButton" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/button_cluster_horizontal_padding" - android:paddingEnd="@dimen/button_cluster_horizontal_padding" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone"> - <!-- The entire LinearLayout here is clickable, so we don't - care about clicks on the ImageButton itself. --> - <ImageButton android:id="@+id/cdmaMergeButtonImage" - android:clickable="false" - style="@style/InCallExtraRowButton" - android:src="@drawable/ic_toolbar_merge" - android:contentDescription="@string/onscreenMergeCallsText" /> - <TextView android:id="@+id/cdmaMergeButtonLabel" - style="@style/InCallExtraRowButtonLabel" - android:text="@string/onscreenMergeCallsText" /> - </LinearLayout> - </FrameLayout> diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml index cbe1fa2f9..237559d46 100644 --- a/InCallUI/res/layout/secondary_call_info.xml +++ b/InCallUI/res/layout/secondary_call_info.xml @@ -27,7 +27,7 @@ android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding" android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding" android:background="@color/incall_banner_secondary_background_color" - android:elevation="@dimen/secondary_call_elevation" > + android:elevation="@dimen/secondary_call_elevation"> <LinearLayout android:layout_width="0dp" diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index bd2642d64..3060339a0 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -62,7 +62,7 @@ <color name="glowpad_text_widget_ring_color">#ffffff</color> <color name="glowpad_widget_active_color">#ffffff</color> <color name="glowpad_text_widget_normal_tint">#cccccc</color> - <color name="glowpad_call_widget_normal_tint">#00e5ff</color> + <color name="glowpad_call_widget_normal_tint">@color/dialtacts_theme_color</color> <color name="glowpad_end_call_widget_normal_tint">#ff1744</color> <color name="glowpad_incoming_widget_tint">#a3a3a3</color> <color name="glowpad_incoming_widget_background_tint">#ffffff</color> |