diff options
Diffstat (limited to 'java/com/android/incallui/answer/impl/res')
6 files changed, 129 insertions, 102 deletions
diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml index d656ceb4e..f8e48942c 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_avatar.xml @@ -21,6 +21,5 @@ android:id="@id/contactgrid_avatar" android:layout_width="@dimen/answer_avatar_size" android:layout_height="@dimen/answer_avatar_size" - android:layout_marginTop="20dp" - android:layout_gravity="center_horizontal" + android:layout_gravity="center" android:elevation="@dimen/answer_data_elevation"/> diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml index 2e42a6ac8..cd85e2f5b 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml @@ -15,15 +15,15 @@ ~ limitations under the License --> <com.android.incallui.answer.impl.AffordanceHolderLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/incoming_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false" - android:keepScreenOn="true"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/incoming_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipChildren="false" + android:clipToPadding="false" + android:keepScreenOn="true"> <TextureView android:id="@+id/incoming_preview_texture_view" @@ -38,124 +38,131 @@ android:layout_height="match_parent" android:importantForAccessibility="no" android:visibility="gone" - app:scaleWidth="@bool/scale_width" - app:scaleHeight="@bool/scale_height"/> + app:scaleHeight="@bool/scale_height" + app:scaleWidth="@bool/scale_width"/> <View - android:id="@+id/incoming_preview_texture_view_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/videocall_overlay_background_color" - android:visibility="gone"/> + android:id="@+id/incoming_preview_texture_view_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/videocall_overlay_background_color" + android:visibility="gone"/> <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <TextView - android:id="@+id/videocall_video_off" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:padding="64dp" - android:accessibilityTraversalBefore="@+id/videocall_speaker_button" - android:drawablePadding="8dp" - android:drawableTop="@drawable/quantum_ic_videocam_off_white_36" - android:gravity="center" - android:text="@string/call_incoming_video_is_off" - android:textAppearance="@style/Dialer.Incall.TextAppearance" - android:visibility="gone"/> + android:id="@+id/videocall_video_off" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="64dp" + android:accessibilityTraversalBefore="@+id/videocall_speaker_button" + android:drawablePadding="8dp" + android:drawableTop="@drawable/quantum_ic_videocam_off_white_36" + android:gravity="center" + android:text="@string/call_incoming_video_is_off" + android:textAppearance="@style/Dialer.Incall.TextAppearance" + android:visibility="gone"/> <LinearLayout - android:id="@+id/incall_contact_grid" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="24dp" - android:clipChildren="false" - android:clipToPadding="false" - android:gravity="top|center_horizontal" - android:orientation="vertical"> + android:id="@+id/incall_contact_grid" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="24dp" + android:clipChildren="false" + android:clipToPadding="false" + android:gravity="top|center_horizontal" + android:orientation="vertical"> <include - android:id="@id/contactgrid_top_row" - layout="@layout/incall_contactgrid_top_row" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:layout_marginStart="24dp" - android:layout_marginEnd="24dp"/> + android:id="@id/contactgrid_top_row" + layout="@layout/incall_contactgrid_top_row" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp"/> <!-- We have to keep deprecated singleLine to allow long text being truncated with ellipses. b/31396406 --> <com.android.incallui.autoresizetext.AutoResizeTextView - android:id="@id/contactgrid_contact_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:layout_marginStart="24dp" - android:layout_marginEnd="24dp" - android:singleLine="true" - android:textAppearance="@style/Dialer.Incall.TextAppearance.Large" - android:textSize="@dimen/answer_contact_name_text_size" - app:autoResizeText_minTextSize="@dimen/answer_contact_name_min_size" - tools:ignore="Deprecated" - tools:text="Jake Peralta"/> + android:id="@id/contactgrid_contact_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:singleLine="true" + android:textAppearance="@style/Dialer.Incall.TextAppearance.Large" + android:textSize="@dimen/answer_contact_name_text_size" + app:autoResizeText_minTextSize="@dimen/answer_contact_name_min_size" + tools:ignore="Deprecated" + tools:text="Jake Peralta"/> <include - android:id="@id/contactgrid_bottom_row" - layout="@layout/incall_contactgrid_bottom_row" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="24dp" - android:layout_marginEnd="24dp"/> + android:id="@id/contactgrid_bottom_row" + layout="@layout/incall_contactgrid_bottom_row" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp"/> <TextView - android:id="@+id/incall_important_call_badge" - android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="@dimen/answer_importance_margin_bottom" - android:elevation="@dimen/answer_data_elevation" - android:gravity="center" - android:singleLine="true" - android:text="@string/call_incoming_important" - android:textAllCaps="true" - android:textAppearance="@style/Dialer.Incall.TextAppearance" - android:textColor="@android:color/black"/> + android:id="@+id/incall_important_call_badge" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="@dimen/answer_importance_margin_bottom" + android:elevation="@dimen/answer_data_elevation" + android:gravity="center" + android:singleLine="true" + android:text="@string/call_incoming_important" + android:textAllCaps="true" + android:textAppearance="@style/Dialer.Incall.TextAppearance" + android:textColor="@android:color/black"/> <FrameLayout - android:id="@+id/incall_location_holder" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:id="@+id/incall_location_holder" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> <FrameLayout - android:id="@+id/incall_data_container" - android:layout_width="match_parent" - android:layout_height="@dimen/answer_data_size" - android:clipChildren="false" - android:clipToPadding="false"/> + android:id="@+id/incall_data_container" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:clipChildren="false" + android:clipToPadding="false"/> + + <!-- Space holder for answer method. This is used to get better scaling to make room for + incall_data_container on different screen size. --> + <Space + android:layout_width="match_parent" + android:layout_height="220dp"/> </LinearLayout> <FrameLayout - android:id="@+id/answer_method_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false"/> + android:id="@+id/answer_method_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipChildren="false" + android:clipToPadding="false"/> </FrameLayout> <com.android.incallui.answer.impl.affordance.SwipeButtonView - android:id="@+id/incoming_secondary_button" - android:layout_width="56dp" - android:layout_height="56dp" - android:layout_gravity="bottom|start" - android:scaleType="center" - android:src="@drawable/quantum_ic_message_white_24" - android:visibility="invisible" - tools:visibility="visible"/> + android:id="@+id/incoming_secondary_button" + android:layout_width="56dp" + android:layout_height="56dp" + android:layout_gravity="bottom|start" + android:scaleType="center" + android:src="@drawable/quantum_ic_message_white_24" + android:visibility="invisible" + tools:visibility="visible"/> <com.android.incallui.answer.impl.affordance.SwipeButtonView android:id="@+id/incoming_secondary_button2" diff --git a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..593778b7a --- /dev/null +++ b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prevucite od ikone da biste odbili porukom"</string> + <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prevucite od ikone da biste odgovorili audio pozivom"</string> + <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prevucite nagore da biste odgovorili i zadržali poziv koji je u toku"</string> + <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prevucite nagore da biste odgovorili i završili poziv koji je na čekanju"</string> + <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prevucite od ikone da biste se javili i završili poziv koji je u toku"</string> + <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite sami…"</string> + <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string> + <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Spikerfon"</string> + <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite sami…"</string> + <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Otkaži"</string> + <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string> + <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odbijte ovaj poziv porukom"</string> + <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Odgovorite audio pozivom"</string> + <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Javite se i završite poziv koji je u toku"</string> + <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odbijte porukom"</string> + <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Odgovorite audio pozivom"</string> + <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Javite se i završite poziv koji je u toku"</string> + <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera je isključena"</string> + <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prevucite nagore pomoću dva prsta da biste odgovorili. Prevucite nadole pomoću dva prsta da biste odbili."</string> + <string name="call_incoming_important" msgid="6477906345540334049">"Važan poziv"</string> +</resources> diff --git a/java/com/android/incallui/answer/impl/res/values-h480dp/dimens.xml b/java/com/android/incallui/answer/impl/res/values-h480dp/dimens.xml index 5dc3f2ac5..eab321fbd 100644 --- a/java/com/android/incallui/answer/impl/res/values-h480dp/dimens.xml +++ b/java/com/android/incallui/answer/impl/res/values-h480dp/dimens.xml @@ -15,7 +15,6 @@ ~ limitations under the License --> <resources> - <dimen name="answer_data_size">150dp</dimen> <dimen name="answer_avatar_size">100dp</dimen> <dimen name="answer_importance_margin_bottom">8dp</dimen> <bool name="answer_important_call_allowed">true</bool> diff --git a/java/com/android/incallui/answer/impl/res/values-h540dp/dimens.xml b/java/com/android/incallui/answer/impl/res/values-h540dp/dimens.xml index 69716e0bd..d5e829928 100644 --- a/java/com/android/incallui/answer/impl/res/values-h540dp/dimens.xml +++ b/java/com/android/incallui/answer/impl/res/values-h540dp/dimens.xml @@ -15,7 +15,6 @@ ~ limitations under the License --> <resources> - <dimen name="answer_data_size">258dp</dimen> <dimen name="answer_avatar_size">172dp</dimen> <dimen name="answer_importance_margin_bottom">8dp</dimen> </resources> diff --git a/java/com/android/incallui/answer/impl/res/values/dimens.xml b/java/com/android/incallui/answer/impl/res/values/dimens.xml index 50aec0328..0bda9d3c7 100644 --- a/java/com/android/incallui/answer/impl/res/values/dimens.xml +++ b/java/com/android/incallui/answer/impl/res/values/dimens.xml @@ -17,7 +17,6 @@ <resources> <dimen name="answer_contact_name_text_size">24sp</dimen> <dimen name="answer_contact_name_min_size">24sp</dimen> - <dimen name="answer_data_size">0dp</dimen> <dimen name="answer_avatar_size">0dp</dimen> <dimen name="answer_importance_margin_bottom">0dp</dimen> <bool name="answer_important_call_allowed">false</bool> |