diff options
Diffstat (limited to 'java/com/android/incallui/rtt/impl/res')
4 files changed, 96 insertions, 61 deletions
diff --git a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml index 6940569a3..753117904 100644 --- a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml +++ b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml @@ -19,8 +19,6 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - <include layout="@layout/rtt_banner"/> - <android.support.v7.widget.RecyclerView android:id="@+id/rtt_recycler_view" android:layout_width="match_parent" @@ -28,6 +26,8 @@ android:paddingBottom="70dp" android:clipToPadding="false"/> + <include layout="@layout/rtt_banner"/> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -75,4 +75,4 @@ android:layout_gravity="bottom" android:clipChildren="false" android:clipToPadding="false"/> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml b/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml index a29fad5f1..eb7e38691 100644 --- a/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml +++ b/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml @@ -46,4 +46,10 @@ style="@style/RttButton" android:drawableStart="@drawable/quantum_ic_add_call_vd_theme_24" android:text="@string/incall_label_add_call"/> + <com.android.incallui.rtt.impl.RttCheckableButton + android:id="@+id/menu_swap_call" + style="@style/RttButton" + android:drawableStart="@drawable/quantum_ic_swap_calls_vd_theme_24" + android:text="@string/incall_label_swap" + android:visibility="gone"/> </LinearLayout>
\ No newline at end of file diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml index f1938056f..c4d3a4290 100644 --- a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml +++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml @@ -14,64 +14,74 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="#F305228F" - android:elevation="3dp"> - <ImageButton - android:id="@+id/rtt_end_call_button" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_marginStart="16dp" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:background="@android:color/transparent" - android:contentDescription="@string/incall_content_description_end_call" - android:scaleType="fitXY" - android:src="@drawable/quantum_ic_call_end_vd_theme_24" - android:tint="#FFDF0000"/> - <LinearLayout - android:layout_width="260dp" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:layout_marginStart="32dp" - android:layout_toEndOf="@id/rtt_end_call_button" - android:orientation="vertical"> - <TextView - android:id="@+id/rtt_name_or_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:fontFamily="sans-serif-medium" - android:includeFontPadding="false" - android:textColor="#FFFFFF" - android:textSize="20sp" - tools:text="Bruce Graham"/> - <Chronometer - android:id="@+id/rtt_timer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:fontFamily="sans-serif-medium" - android:includeFontPadding="false" - android:textColor="#FFFFFF" - android:textSize="14sp" - tools:text="00:09"/> - </LinearLayout> - <ImageButton - android:id="@+id/rtt_overflow_button" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_marginEnd="12dp" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:background="@android:color/transparent" - android:contentDescription="@string/content_description_overflow" - android:scaleType="fitXY" - android:src="@drawable/quantum_ic_more_vert_vd_theme_24" - android:tint="#FFFFFF"/> + android:layout_height="wrap_content" + android:orientation="vertical"> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="#F305228F" + android:elevation="3dp"> + <ImageButton + android:id="@+id/rtt_end_call_button" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginStart="16dp" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:background="@android:color/transparent" + android:contentDescription="@string/incall_content_description_end_call" + android:scaleType="fitXY" + android:src="@drawable/quantum_ic_call_end_vd_theme_24" + android:tint="#FFDF0000"/> + <LinearLayout + android:layout_width="260dp" + android:layout_height="match_parent" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_marginStart="32dp" + android:layout_toEndOf="@id/rtt_end_call_button" + android:orientation="vertical"> + <TextView + android:id="@+id/rtt_name_or_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:fontFamily="sans-serif-medium" + android:includeFontPadding="false" + android:textColor="#FFFFFF" + android:textSize="20sp" + tools:text="Bruce Graham"/> + <Chronometer + android:id="@+id/rtt_timer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:fontFamily="sans-serif-medium" + android:includeFontPadding="false" + android:textColor="#FFFFFF" + android:textSize="14sp" + tools:text="00:09"/> + </LinearLayout> + <ImageButton + android:id="@+id/rtt_overflow_button" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginEnd="12dp" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:background="@android:color/transparent" + android:contentDescription="@string/content_description_overflow" + android:scaleType="fitXY" + android:src="@drawable/quantum_ic_more_vert_vd_theme_24" + android:tint="#FFFFFF"/> -</RelativeLayout>
\ No newline at end of file + </RelativeLayout> + <FrameLayout + android:id="@id/rtt_on_hold_banner" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + +</LinearLayout>
\ No newline at end of file diff --git a/java/com/android/incallui/rtt/impl/res/values/ids.xml b/java/com/android/incallui/rtt/impl/res/values/ids.xml new file mode 100644 index 000000000..3e4755b7c --- /dev/null +++ b/java/com/android/incallui/rtt/impl/res/values/ids.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 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 + --> +<resources> + <item name="rtt_on_hold_banner" type="id"/> +</resources> |