diff options
Diffstat (limited to 'java/com/android/incallui/video/impl/res')
14 files changed, 131 insertions, 57 deletions
diff --git a/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml index 40b50bc70..9a3682f02 100644 --- a/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml +++ b/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml @@ -60,33 +60,25 @@ <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_speaker_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginEnd="24dp" android:checked="true" - android:src="@drawable/quantum_ic_volume_up_white_36" + android:src="@drawable/quantum_ic_volume_up_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_speaker" app:contentDescriptionUnchecked="@string/incall_content_description_earpiece" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginEnd="24dp" - android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_white_36" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_muted" app:contentDescriptionUnchecked="@string/incall_content_description_unmuted" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_video" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginEnd="24dp" - android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_36" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_video_off" app:contentDescriptionUnchecked="@string/incall_content_description_video_on" /> @@ -111,7 +103,7 @@ android:layout_width="@dimen/videocall_button_size" android:layout_height="@dimen/videocall_button_size" android:contentDescription="@string/incall_content_description_swap_calls" - android:src="@drawable/quantum_ic_swap_calls_white_36" + android:src="@drawable/quantum_ic_swap_calls_vd_theme_24" android:visibility="gone" tools:visibility="visible" /> diff --git a/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml b/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml index 1fb1bb088..66602837e 100644 --- a/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml +++ b/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml @@ -1,6 +1,21 @@ <?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. +--> <ImageButton xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/videocall_switch_video" style="@style/Incall.Button.VideoCall" android:contentDescription="@string/incall_content_description_swap_video" + android:scaleType="center" android:src="@drawable/front_back_switch_button_animation"/> diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml index f8c6fc3c7..ed32ae235 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml @@ -1,4 +1,18 @@ <?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. +--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -85,7 +99,7 @@ android:layout_alignRight="@+id/videocall_video_preview" android:layout_alignTop="@+id/videocall_video_preview" android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_24" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" android:tint="@color/videocall_camera_off_tint" android:tintMode="src_in" android:visibility="gone" @@ -101,7 +115,8 @@ android:background="@drawable/videocall_background_circle_white" android:contentDescription="@string/incall_content_description_muted" android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_black_24" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" + android:tint="@android:color/black" android:visibility="gone" tools:visibility="visible"/> diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml index 2353deea1..f74456963 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml @@ -1,4 +1,18 @@ <?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. +--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -79,7 +93,7 @@ android:layout_alignRight="@+id/videocall_video_preview" android:layout_alignTop="@+id/videocall_video_preview" android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_36" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" android:visibility="gone" android:importantForAccessibility="no" tools:visibility="visible"/> @@ -93,7 +107,8 @@ android:background="@drawable/videocall_background_circle_white" android:contentDescription="@string/incall_content_description_muted" android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_black_24" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" + android:tint="@android:color/black" android:visibility="gone" tools:visibility="visible"/> diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml index 1a2bc2429..dd1bd61c2 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml @@ -65,7 +65,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_24" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" android:tint="@color/videocall_camera_off_tint" android:tintMode="src_in" android:visibility="gone" @@ -84,7 +84,8 @@ android:background="@drawable/videocall_background_circle_white" android:contentDescription="@string/incall_content_description_muted" android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_black_24" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" + android:tint="@android:color/black" android:visibility="gone" tools:visibility="visible"/> diff --git a/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml b/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml index 87c2e1b6c..f473dd8c3 100644 --- a/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml +++ b/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml @@ -1,4 +1,18 @@ <?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. +--> <ImageButton xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/videocall_switch_video" style="@style/Incall.Button.VideoCall" diff --git a/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml b/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml index 3cf050467..56797d92e 100644 --- a/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml +++ b/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml @@ -1,4 +1,18 @@ <?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" xmlns:app="http://schemas.android.com/apk/res-auto" diff --git a/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml b/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml index b3141bdf3..70cbac8d2 100644 --- a/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml +++ b/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml @@ -1,4 +1,18 @@ <?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. +--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -46,31 +60,25 @@ <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_speaker_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginBottom="@dimen/videocall_button_spacing" android:checked="true" - android:src="@drawable/quantum_ic_volume_up_white_36" + android:src="@drawable/quantum_ic_volume_up_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_speaker" app:contentDescriptionUnchecked="@string/incall_content_description_earpiece" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginBottom="@dimen/videocall_button_spacing" - android:src="@drawable/quantum_ic_mic_off_white_36" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_muted" app:contentDescriptionUnchecked="@string/incall_content_description_unmuted" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_video" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginBottom="@dimen/videocall_button_spacing" - android:src="@drawable/quantum_ic_videocam_off_white_36" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_video_off" app:contentDescriptionUnchecked="@string/incall_content_description_video_on" /> @@ -92,10 +100,8 @@ <ImageButton android:id="@+id/videocall_switch_on_hold" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:contentDescription="@string/incall_content_description_swap_calls" - android:src="@drawable/quantum_ic_swap_calls_white_36" + android:src="@drawable/quantum_ic_swap_calls_vd_theme_24" android:visibility="gone" tools:visibility="visible" /> diff --git a/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml b/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml index d71b3c00e..404e5c842 100644 --- a/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml +++ b/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml @@ -1,4 +1,18 @@ <?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. +--> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -45,33 +59,25 @@ <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_speaker_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginEnd="24dp" android:checked="true" - android:src="@drawable/quantum_ic_volume_up_white_36" + android:src="@drawable/quantum_ic_volume_up_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_speaker" app:contentDescriptionUnchecked="@string/incall_content_description_earpiece" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginEnd="24dp" - android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_white_36" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_muted" app:contentDescriptionUnchecked="@string/incall_content_description_unmuted" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_video" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginEnd="24dp" - android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_36" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_video_off" app:contentDescriptionUnchecked="@string/incall_content_description_video_on" /> @@ -93,10 +99,8 @@ <ImageButton android:id="@+id/videocall_switch_on_hold" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:contentDescription="@string/incall_content_description_swap_calls" - android:src="@drawable/quantum_ic_swap_calls_white_36" + android:src="@drawable/quantum_ic_swap_calls_vd_theme_24" android:visibility="gone" tools:visibility="visible" /> diff --git a/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml index d2dc992b7..7cea79267 100644 --- a/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml +++ b/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml @@ -61,33 +61,25 @@ <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_speaker_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginBottom="@dimen/videocall_button_spacing" android:checked="true" - android:src="@drawable/quantum_ic_volume_up_white_36" + android:src="@drawable/quantum_ic_volume_up_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_speaker" app:contentDescriptionUnchecked="@string/incall_content_description_earpiece" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_button" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginBottom="@dimen/videocall_button_spacing" - android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_white_36" + android:src="@drawable/quantum_ic_mic_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_muted" app:contentDescriptionUnchecked="@string/incall_content_description_unmuted" /> <com.android.incallui.video.impl.CheckableImageButton android:id="@+id/videocall_mute_video" style="@style/Incall.Button.VideoCall" - android:layout_width="@dimen/videocall_button_size" - android:layout_height="@dimen/videocall_button_size" android:layout_marginBottom="@dimen/videocall_button_spacing" - android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_36" + android:src="@drawable/quantum_ic_videocam_off_vd_theme_24" app:contentDescriptionChecked="@string/incall_content_description_video_off" app:contentDescriptionUnchecked="@string/incall_content_description_video_on" /> @@ -112,7 +104,7 @@ android:layout_width="@dimen/videocall_button_size" android:layout_height="@dimen/videocall_button_size" android:contentDescription="@string/incall_content_description_swap_calls" - android:src="@drawable/quantum_ic_swap_calls_white_36" + android:src="@drawable/quantum_ic_swap_calls_vd_theme_24" android:visibility="gone" tools:visibility="visible" /> diff --git a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml index e9e7f9e8b..d4a5e17d6 100644 --- a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml +++ b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml @@ -17,6 +17,7 @@ <resources> <dimen name="videocall_button_spacing">16dp</dimen> <dimen name="videocall_button_size">72dp</dimen> + <dimen name="videocall_button_padding">18dp</dimen> <dimen name="videocall_preview_width">88dp</dimen> <dimen name="videocall_preview_height">88dp</dimen> <dimen name="videocall_preview_long">116dp</dimen> diff --git a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml index e9e7f9e8b..d4a5e17d6 100644 --- a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml +++ b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml @@ -17,6 +17,7 @@ <resources> <dimen name="videocall_button_spacing">16dp</dimen> <dimen name="videocall_button_size">72dp</dimen> + <dimen name="videocall_button_padding">18dp</dimen> <dimen name="videocall_preview_width">88dp</dimen> <dimen name="videocall_preview_height">88dp</dimen> <dimen name="videocall_preview_long">116dp</dimen> diff --git a/java/com/android/incallui/video/impl/res/values/dimens.xml b/java/com/android/incallui/video/impl/res/values/dimens.xml index 606b158d9..b6449a6d1 100644 --- a/java/com/android/incallui/video/impl/res/values/dimens.xml +++ b/java/com/android/incallui/video/impl/res/values/dimens.xml @@ -23,4 +23,5 @@ <dimen name="videocall_preview_margin_end">24dp</dimen> <dimen name="videocall_button_spacing">8dp</dimen> <dimen name="videocall_button_size">60dp</dimen> + <dimen name="videocall_button_padding">12dp</dimen> </resources> diff --git a/java/com/android/incallui/video/impl/res/values/styles.xml b/java/com/android/incallui/video/impl/res/values/styles.xml index 010aca2d1..03395d989 100644 --- a/java/com/android/incallui/video/impl/res/values/styles.xml +++ b/java/com/android/incallui/video/impl/res/values/styles.xml @@ -16,10 +16,13 @@ --> <resources> <style name="Incall.Button.VideoCall" parent="Widget.AppCompat.ImageButton"> + <item name="android:layout_height">@dimen/videocall_button_size</item> + <item name="android:layout_width">@dimen/videocall_button_size</item> <item name="android:background">@drawable/videocall_video_button_background</item> - <item name="android:scaleType">center</item> <item name="android:tint">@color/videocall_button_icon_tint</item> <item name="android:tintMode">src_atop</item> + <item name="android:padding">@dimen/videocall_button_padding</item> + <item name="android:scaleType">fitCenter</item> <item name="android:stateListAnimator">@animator/disabled_alpha</item> </style> <style name="VideoPreviewHolder"> |