diff options
Diffstat (limited to 'java/com/android/incallui/rtt/impl/res')
5 files changed, 29 insertions, 72 deletions
diff --git a/java/com/android/incallui/rtt/impl/res/layout/activity_rtt.xml b/java/com/android/incallui/rtt/impl/res/layout/activity_rtt.xml deleted file mode 100644 index b48e8d43f..000000000 --- a/java/com/android/incallui/rtt/impl/res/layout/activity_rtt.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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 - --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <FrameLayout - android:id="@+id/fragment_rtt" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - -</LinearLayout>
\ No newline at end of file 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 7ba6a09e3..5ba9f4ee8 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 @@ -17,7 +17,8 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/dialer_theme_color"> + android:background="@color/dialer_theme_color" + android:fitsSystemWindows="true"> <include layout="@layout/rtt_banner"/> @@ -52,6 +53,8 @@ android:inputType="textMultiLine|text" android:maxLines="4" android:minHeight="53dp" + android:textColor="#DD000000" + android:textColorHint="#757575" android:textSize="16sp"/> <ImageButton android:id="@+id/rtt_chat_submit_button" 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 4ce94f9fb..f1938056f 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 @@ -17,79 +17,61 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="56dp" - android:background="#FAFAFA" + android:layout_height="?attr/actionBarSize" + android:background="#F305228F" android:elevation="3dp"> <ImageButton - android:id="@+id/rtt_back" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + 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/content_description_rtt_back_button" - android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" - android:tint="#DF000000"/> + 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="wrap_content" + 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_back" + 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="#DD000000" + 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="#DD000000" + android:textColor="#FFFFFF" android:textSize="14sp" tools:text="00:09"/> </LinearLayout> <ImageButton - android:id="@+id/rtt_hang_up_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="16dp" + 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/incall_content_description_end_call" - android:src="@drawable/quantum_ic_call_end_vd_theme_24" - android:tint="#FFDF0000"/> - <ImageButton - android:id="@+id/rtt_speaker_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="24dp" - android:layout_centerVertical="true" - android:layout_toStartOf="@id/rtt_hang_up_button" - android:background="@android:color/transparent" - android:contentDescription="@string/incall_content_description_speaker" - android:src="@drawable/quantum_ic_volume_up_vd_theme_24" - android:tint="#DD000000"/> - <ImageButton - android:id="@+id/rtt_mic_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="24dp" - android:layout_centerVertical="true" - android:layout_toStartOf="@id/rtt_speaker_button" - android:background="@android:color/transparent" - android:contentDescription="@string/incall_content_description_unmuted" - android:src="@drawable/quantum_ic_mic_off_vd_theme_24" - android:tint="#DD000000"/> + 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 diff --git a/java/com/android/incallui/rtt/impl/res/values/colors.xml b/java/com/android/incallui/rtt/impl/res/values/colors.xml index 402cac4a0..c25ad21f2 100644 --- a/java/com/android/incallui/rtt/impl/res/values/colors.xml +++ b/java/com/android/incallui/rtt/impl/res/values/colors.xml @@ -15,5 +15,6 @@ ~ limitations under the License --> <resources> - <color name="rtt_status_bar_color">#E0E0E0</color> + <color name="rtt_status_bar_color">#03165C</color> + <color name="rtt_navigation_bar_color">#FAFAFA</color> </resources>
\ No newline at end of file diff --git a/java/com/android/incallui/rtt/impl/res/values/strings.xml b/java/com/android/incallui/rtt/impl/res/values/strings.xml index 523abdcbc..0b9eb71f4 100644 --- a/java/com/android/incallui/rtt/impl/res/values/strings.xml +++ b/java/com/android/incallui/rtt/impl/res/values/strings.xml @@ -18,9 +18,6 @@ <!-- Content description for submit chat input button. [CHAR LIMIT=NONE] --> <string name="content_description_rtt_check_button">Go ahead</string> - <!-- Content description for navigate back button on RTT chat window. [CHAR LIMIT=NONE] --> - <string name="content_description_rtt_back_button">Back</string> - <!-- Hint text for input box. [CHAR LIMIT=NONE] --> <string name="rtt_input_hint">Type a message</string> |