diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/btn_change_to_video.xml | 2 | ||||
-rw-r--r-- | res/layout/videocall_handoff_item.xml | 41 | ||||
-rw-r--r-- | res/values/cm_colors.xml | 23 | ||||
-rw-r--r-- | res/values/cm_dimens.xml | 27 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 7 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
6 files changed, 100 insertions, 2 deletions
diff --git a/res/drawable/btn_change_to_video.xml b/res/drawable/btn_change_to_video.xml index a26cee3e..8c353b9e 100644 --- a/res/drawable/btn_change_to_video.xml +++ b/res/drawable/btn_change_to_video.xml @@ -21,7 +21,7 @@ <item android:id="@+id/backgroundItem" android:drawable="@drawable/btn_background" /> - <item> + <item android:id="@+id/foregroundItem"> <bitmap android:src="@drawable/ic_toolbar_video" android:gravity="center" android:tint="@color/selectable_icon_tint" diff --git a/res/layout/videocall_handoff_item.xml b/res/layout/videocall_handoff_item.xml new file mode 100644 index 00000000..d4f4ac96 --- /dev/null +++ b/res/layout/videocall_handoff_item.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 The CyanogenMod 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="horizontal" + android:layout_width="match_parent" + android:layout_height="@dimen/videocall_handoff_item_height"> + + <ImageView + android:id="@+id/icon" + android:layout_width="@dimen/videocall_handoff_item_icon_width" + android:layout_height="@dimen/videocall_handoff_item_icon_height" + android:layout_marginStart="@dimen/videocall_handoff_item_start_margin" + android:layout_marginEnd="@dimen/videocall_handoff_item_icon_end_margin" + android:layout_gravity="center_vertical" /> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/videocall_handoff_item_end_margin" + android:textColor="@color/videocall_handoff_item_text_color" + android:textSize="@dimen/videocall_handoff_item_text_size" + android:singleLine="true" + android:ellipsize="end" + android:layout_gravity="center_vertical" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml new file mode 100644 index 00000000..e85edd38 --- /dev/null +++ b/res/values/cm_colors.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 The CyanogenMod 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> + <color name="videocall_handoff_item_text_color">#de000000</color> + <color name="vidoecall_handoff_default_video_call_color">#8a000000</color> + + <color name="snackbar_action_text_color">@color/dialer_theme_color</color> +</resources>
\ No newline at end of file diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml new file mode 100644 index 00000000..8557fd67 --- /dev/null +++ b/res/values/cm_dimens.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 The CyanogenMod 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> + <!-- Video call handoff list --> + <dimen name="videocall_handoff_item_height">48dp</dimen> + <dimen name="videocall_handoff_item_icon_width">24dp</dimen> + <dimen name="videocall_handoff_item_icon_height">24dp</dimen> + <dimen name="videocall_handoff_item_start_margin">23dp</dimen> + <dimen name="videocall_handoff_item_icon_end_margin">17dp</dimen> + <dimen name="videocall_handoff_item_end_margin">23dp</dimen> + <dimen name="videocall_handoff_item_text_size">18sp</dimen> +</resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 29c74c16..7d553cd3 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -44,4 +44,11 @@ <string name="recording_warning_title">Enable call recording?</string> <string name="recording_warning_text">Notice: You are responsible for compliance with any laws, regulations and rules that apply to the use of call recording functionality and the use or distribution of those recordings.</string> <string name="onscreenTransferCall">Transfer call</string> + + <!-- In-call screen: Video Call Options for VT or plugin handoff --> + <string name="video_call_option_title">Select video service</string> + + <string name="snackbar_incall_plugin_no_invite_found">This contact is not a <xliff:g id="incall_plugin">%s</xliff:g> contact. You must add this person first to make video calls.</string> + <string name="snackbar_incall_plugin_contact_invite">This contact is not a <xliff:g id="incall_plugin">%s</xliff:g> contact. Invite this contact?</string> + <string name="snackbar_invite_action_text">INVITE</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index bcd0e70a..0935f332 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -74,7 +74,7 @@ circular reveal animation for a new outgoing call to work correctly. We don't just use Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the InCallActivity to have the correct Material style. --> - <style name="Theme.InCallScreen" parent="@android:style/Theme.Material.Light"> + <style name="Theme.InCallScreen" parent="style/Theme.AppCompat.Light"> <item name="android:windowAnimationStyle">@null</item> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBackground">@android:color/transparent</item> |