diff options
Diffstat (limited to 'InCallUI/res/values')
| -rw-r--r-- | InCallUI/res/values/array.xml | 21 | ||||
| -rw-r--r-- | InCallUI/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/values/dimens.xml | 5 | ||||
| -rw-r--r-- | InCallUI/res/values/strings.xml | 25 |
4 files changed, 22 insertions, 31 deletions
diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml index 46592e126..2e38c2c46 100644 --- a/InCallUI/res/values/array.xml +++ b/InCallUI/res/values/array.xml @@ -74,8 +74,6 @@ <item>@null</item> <item>@drawable/ic_lockscreen_decline</item> <item>@drawable/ic_lockscreen_answer_video</item> - <item>@drawable/ic_lockscreen_answer_tx_video</item> - <item>@drawable/ic_lockscreen_answer_rx_video</item> </array> <array name="incoming_call_widget_video_without_sms_target_descriptions"> <item>@string/description_target_answer_video_call</item> @@ -100,8 +98,6 @@ <item>@drawable/ic_lockscreen_text</item> <item>@drawable/ic_lockscreen_decline</item> <item>@drawable/ic_lockscreen_answer</item> - <item>@drawable/ic_lockscreen_answer_tx_video</item> - <item>@drawable/ic_lockscreen_answer_rx_video</item> </array> <array name="incoming_call_widget_video_with_sms_target_descriptions"> <item>@string/description_target_answer_video_call</item> @@ -126,8 +122,6 @@ <item>@null</item> <item>@drawable/ic_lockscreen_decline</item> <item>@drawable/ic_lockscreen_answer</item> - <item>@drawable/ic_lockscreen_answer_tx_video</item> - <item>@drawable/ic_lockscreen_answer_rx_video</item> </array> <array name="incoming_call_widget_video_upgrade_request_target_descriptions"> <item>@string/description_target_accept_upgrade_to_video_request</item> @@ -152,26 +146,27 @@ <!-- For accept/reject upgrade to video transmit in active video call - Accept upgrade to video request (drag right) - - Decline upgrade to video request (drag left)--> + - Decline upgrade to video request (drag left) + TODO: This should be automatically rejected in the lower layers --> <array name="incoming_call_widget_video_transmit_accept_reject_request_targets"> - <item>@drawable/ic_lockscreen_answer_tx_video</item> + <item>@drawable/ic_lockscreen_answer_video</item> <item>@drawable/ic_lockscreen_decline</item> </array> <array name="incoming_call_widget_video_transmit_request_target_descriptions"> - <item>@string/description_target_accept_upgrade_to_video_transmit_request</item> - <item>@string/description_target_decline_upgrade_to_video_transmit_request</item> + <item>@string/description_target_accept_upgrade_to_video_request</item> + <item>@string/description_target_decline_upgrade_to_video_request</item> </array> <!-- For accept/reject upgrade to video receive in active video call - Accept upgrade to video request (drag right) - Decline upgrade to video request (drag left)--> <array name="incoming_call_widget_video_receive_accept_reject_request_targets"> - <item>@drawable/ic_lockscreen_answer_rx_video</item> + <item>@drawable/ic_lockscreen_answer_video</item> <item>@drawable/ic_lockscreen_decline</item> </array> <array name="incoming_call_widget_video_receive_request_target_descriptions"> - <item>@string/description_target_accept_upgrade_to_video_receive_request</item> - <item>@string/description_target_decline_upgrade_to_video_receive_request</item> + <item>@string/description_target_accept_upgrade_to_video_request</item> + <item>@string/description_target_decline_upgrade_to_video_request</item> </array> </resources> diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index afc557bc1..cac382deb 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -59,6 +59,8 @@ <!-- Background color of action bars --> <color name="actionbar_background_color">@color/dialer_theme_color</color> + <!-- Background color for status bar. For portrait this will be ignored. --> + <color name="statusbar_background_color">@color/dialer_theme_color</color> <color name="translucent_shadow">#33999999</color> diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index 43307e8db..0739234f2 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -16,6 +16,9 @@ --> <resources> + <!-- Whether or not the landscape mode layout is currently being used --> + <bool name="is_layout_landscape">false</bool> + <!-- Dimensions for CallCard elements (the normal in-call UI) --> <!-- Height of the "call banner" overlay on top of the upper part of the call info area. @@ -67,7 +70,7 @@ <dimen name="dialpad_digits_adjustable_height">50dp</dimen> <dimen name="dialpad_key_numbers_size">36dp</dimen> - <dimen name="floating_action_bar_vertical_offset">-24dp</dimen> + <dimen name="floating_action_button_vertical_offset">-24dp</dimen> <dimen name="call_button_margin_vertical">8dp</dimen> <dimen name="call_button_margin_horizontal">6dp</dimen> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 99b8111bb..cfe3d41ab 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -255,23 +255,14 @@ to dial using the physical keyboard --> <string name="dialerKeyboardHintText">Use keyboard to dial</string> - <!-- Text for the overflow "Hold call" menu item. --> - <string name="overflowHoldMenuItemText">Hold call</string> - <!-- Text for the overflow "Resume call" menu item. --> - <string name="overflowResumeMenuItemText">Resume call</string> - <!-- Text for the overflow "Add call" menu item. --> - <string name="overflowAddMenuItemText">Add call</string> - <!-- Text for the onscreen "Merge calls" menu item. --> - <string name="overflowMergeMenuItemText">Merge calls</string> - <!-- Text for the onscreen "Swap calls" menu item. --> - <string name="overflowSwapMenuItemText">Swap calls</string> - <!-- Text for the overflow "Manage Conference Video Call" menu item. --> - <string name="overflowManageConferenceMenuItemText">Manage Conference</string> - - <!-- Text for the onscreen "Hold" button --> - <string name="onscreenHoldText">Hold</string> + <!-- Text for the onscreen "Hold" button when it is not selected. Pressing it will put + the call on hold. --> + <string name="onscreenHoldText_unselected">Hold Call</string> + <!-- Text for the onscreen "Hold" button when it is selected. Pressing it will resume + the call from a previously held state. --> + <string name="onscreenHoldText_selected">Resume Call</string> <!-- Text for the onscreen "End call" button --> - <string name="onscreenEndCallText">End</string> + <string name="onscreenEndCallText">End Call</string> <!-- Text for the onscreen "Show Dialpad" button --> <string name="onscreenShowDialpadText">Dialpad</string> <!-- Text for the onscreen "Mute" button --> @@ -456,7 +447,7 @@ <!-- This can be used in any application wanting to disable the text "Emergency number" --> <string name="emergency_call_dialog_number_for_display">Emergency number</string> - <!-- STOPSHIP These strings are for debugging only --> + <!-- STOPSHIP These strings are for debugging only --> <!-- Call substate label --> <string name="call_substate_label" translatable="false">Call substate - \u000a</string> <!-- Call substate label for call resumed --> |