diff options
Diffstat (limited to 'usbtuner-res/values')
| -rw-r--r-- | usbtuner-res/values/colors.xml | 6 | ||||
| -rw-r--r-- | usbtuner-res/values/dimens.xml | 34 | ||||
| -rw-r--r-- | usbtuner-res/values/integers.xml | 5 | ||||
| -rw-r--r-- | usbtuner-res/values/strings.xml | 53 | ||||
| -rw-r--r-- | usbtuner-res/values/styles.xml | 120 |
5 files changed, 35 insertions, 183 deletions
diff --git a/usbtuner-res/values/colors.xml b/usbtuner-res/values/colors.xml index bbcc431f..873ecc8e 100644 --- a/usbtuner-res/values/colors.xml +++ b/usbtuner-res/values/colors.xml @@ -16,15 +16,9 @@ --> <resources> - <color name="ut_guidedstep_background">#01579B</color> - <color name="ut_guidance_title_text">#EEEEEE</color> - <color name="ut_guidance_breadcrumb_text">#EEEEEE</color> - <color name="ut_guidance_description_text">#B3EEEEEE</color> - <color name="ut_guidedactions_title_text">#EEEEEE</color> <color name="ut_scan_title_text">#EEEEEE</color> <color name="ut_scan_description_text">#B3EEEEEE</color> <color name="ut_scan_progress">#EEEEEE</color> <color name="ut_scan_progress_background">#26EEEEEE</color> <color name="ut_scan_button_text">#EEEEEE</color> - <color name="ut_scan_channellist_background">#26EEEEEE</color> </resources>
\ No newline at end of file diff --git a/usbtuner-res/values/dimens.xml b/usbtuner-res/values/dimens.xml index 0a09b062..1fe39f6c 100644 --- a/usbtuner-res/values/dimens.xml +++ b/usbtuner-res/values/dimens.xml @@ -16,41 +16,7 @@ --> <resources> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="ut_activity_horizontal_margin">16dp</dimen> - <dimen name="ut_activity_vertical_margin">16dp</dimen> - - <dimen name="ut_guidance_section_width">592dp</dimen> - <dimen name="ut_guidedactions_section_width">368dp</dimen> - - <dimen name="ut_guidedstep_entry_slide_from">100dp</dimen> - <dimen name="ut_guidedstep_exit_slide_to">-100dp</dimen> - - <dimen name="ut_guidance_padding_start">56dp</dimen> - <dimen name="ut_guidance_padding_end">32dp</dimen> - <dimen name="ut_guidance_padding_top">27dp</dimen> - <dimen name="ut_guidance_anchor_height">156dp</dimen> - - <dimen name="ut_guidance_title_text_size">34sp</dimen> - <dimen name="ut_guidance_breadcrumb_text_size">14sp</dimen> - <dimen name="ut_guidance_description_text_size">14sp</dimen> - <dimen name="ut_guidance_description_margin_top">8dp</dimen> - - <dimen name="ut_guidedactions_padding_start">24dp</dimen> - <dimen name="ut_guidedactions_padding_end">40dp</dimen> - <dimen name="ut_guidedactions_padding_top">27dp</dimen> - <dimen name="ut_guidedactions_padding_bottom">48dp</dimen> - <dimen name="ut_guidedactions_anchor_height">163dp</dimen> - <dimen name="ut_guidedactions_selector_height">48dp</dimen> - - <dimen name="ut_guidedactions_item_height">48dp</dimen> - <dimen name="ut_guidedactions_item_padding_start">16dp</dimen> - <dimen name="ut_guidedactions_item_padding_end">16dp</dimen> - <dimen name="ut_guidedactions_item_padding_top">14dp</dimen> - <dimen name="ut_guidedactions_item_padding_bottom">15dp</dimen> - <dimen name="ut_scan_icon_width">80dp</dimen> - <dimen name="ut_scan_icon_height">80dp</dimen> <dimen name="ut_scan_icon_margin_right">24dp</dimen> <dimen name="ut_scan_title_text_size">34sp</dimen> diff --git a/usbtuner-res/values/integers.xml b/usbtuner-res/values/integers.xml index 21b438e9..65d20c67 100644 --- a/usbtuner-res/values/integers.xml +++ b/usbtuner-res/values/integers.xml @@ -16,10 +16,5 @@ --> <resources> - <integer name="ut_guidance_title_max_lines">2</integer> - <integer name="ut_guidance_description_max_lines">10</integer> - <integer name="ut_guidedactions_vertical_spcae">8</integer> <integer name="ut_scan_title_max_lines">2</integer> - <integer name="ut_entry_anim_duration">300</integer> - <integer name="ut_exit_anim_duration">300</integer> </resources>
\ No newline at end of file diff --git a/usbtuner-res/values/strings.xml b/usbtuner-res/values/strings.xml index e3a8586d..2b08a354 100644 --- a/usbtuner-res/values/strings.xml +++ b/usbtuner-res/values/strings.xml @@ -18,26 +18,15 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Name of this application. It appears in TV app UI, as one of available TV inputs. --> <string name="bt_app_name">TV Tuner</string> - <!-- Name of this application when one uses USB tuner. It appears in TV app UI, as one of + <!-- Name of this application when one uses USB tuners. It appears in TV app UI, as one of available TV inputs. --> <string name="ut_app_name">USB TV Tuner</string> - <!-- Title for an action which turns a feature on [CHAR LIMIT=30] --> - <string name="ut_setup_on">On</string> - <!-- Title for an action which turns a feature off [CHAR LIMIT=30] --> - <string name="ut_setup_off">Off</string> + <!-- Name of this application when one uses network tuners. It appears in TV app UI, as one of + available TV inputs. --> + <string name="nt_app_name">Network TV Tuner (BETA)</string> <!-- Message shown when the scanning process is being canceled by a user and the scanning process needs the time to wait to finish the processing --> <string name="ut_setup_cancel">Please wait to finish processing</string> - <!-- Message that asks a user to select the type of signal to be used for input among - the choices like terrestrial, cable, or satellite --> - <string name="ut_select_channel_map">Select your channel source</string> - <!-- Message that indicates TV input signal is lost due to physical disconnection or bad - reception --> - <string name="ut_no_signal">No Signal</string> - <!-- Message that says TV failed to change to a channel (or tune) --> - <string name="ut_fail_to_tune">Failed to tune to <xliff:g id="channel_name">%s</xliff:g></string> - <!-- Message that says TV failed to change(or tune) to a channel which has no title --> - <string name="ut_fail_to_tune_to_unknown_channel">Failed to tune</string> <!-- Message shown when the scanned channels became invalid due to incompatible changes found across application versions, hence a user is required to rescan the channels --> <string name="ut_rescan_needed">Tuner software has been recently updated. Please re-scan the @@ -45,12 +34,16 @@ <!-- Message that says audio of the current channel is not available due to surround sound of TV device disabled --> <string name="ut_surround_sound_disabled">Enable surround sound in system sound settings to enable audio</string> + <!-- Message that says audio of the current channel is not available due to AC3 passthrough is not usable --> + <string name="audio_passthrough_not_supported">Cannot play audio. Please try another TV</string> <!-- Usb Tuner setup common UI breadcrumb --> <string name="ut_setup_breadcrumb">Channel tuner setup</string> <!-- Title for TV Tuner main setup menu when no channel exists --> <string name="bt_setup_new_title">TV Tuner setup</string> <!-- Title for USB tuner main setup menu when no channel exists --> <string name="ut_setup_new_title">USB channel tuner setup</string> + <!-- Title for network tuner main setup menu when no channel exists --> + <string name="nt_setup_new_title">Network tuner setup</string> <!-- Description for TV tuner main setup menu when no channel exists --> <string name="bt_setup_new_description">Verify your TV is connected to a TV signal source.\n\nIf using an over-the-air antenna, you may need to adjust its placement or @@ -61,6 +54,11 @@ to a TV signal source.\n\nIf using an over-the-air antenna, you may need to adjust its placement or direction to receive the most channels. For best results, place it high and near a window.</string> + <!-- Description for network tuner main setup menu when no channel exists --> + <string name="nt_setup_new_description">Verify the network tuner is powered on and connected + to a TV signal source.\n\nIf using an over-the-air antenna, you may need to adjust its + placement or direction to receive the most channels. For best results, + place it high and near a window.</string> <!-- Menu items for USB tuner main setup menu when no channel exists --> <string-array name="ut_setup_new_choices"> <!-- Continue setup --> @@ -82,6 +80,12 @@ to a TV signal source.\n\nIf using an over-the-air antenna, you may need to adjust its placement or direction to receive the most channels. For best results, place it high and near a window.</string> + <!-- Description for network tuner main setup menu when channel exists already --> + <string name="nt_setup_again_description">This will remove the channels found from the network + tuner and scan for new channels again.\n\nVerify the network tuner is powered on and + connected to a TV signal source.\n\nIf using an over-the-air antenna, you may need to adjust + its placement or direction to receive the most channels. For best results, place it high and + near a window.</string> <!-- Menu items for USB tuner main setup menu when channel exists already --> <string-array name="ut_setup_again_choices"> <!-- Continue setup --> @@ -109,6 +113,8 @@ <string name="bt_channel_scan">TV tuner setup</string> <!-- Title for channel scanning menu. Use this title with USB tuners --> <string name="ut_channel_scan">USB channel tuner setup</string> + <!-- Title for channel scanning menu. Use this title with network tuners --> + <string name="nt_channel_scan">Network channel tuner setup</string> <!-- Message that says channel is not yet scanned during channel scanning process --> <string name="ut_channel_scan_time">This may take several minutes</string> <!-- Message that says Tuner is not available --> @@ -145,11 +151,17 @@ your TV is connected to a TV signal source.\n\nIf using an over-the-air antenna, adjust its placement or direction. For best results, place it high and near a window and scan again.</string> - <!-- Description for channel scanning result menu when no channel was found --> + <!-- Description for channel scanning result menu when no channel was found with USB tuners--> <string name="ut_result_not_found_description">The scan did not find any channels. Verify the USB tuner is plugged in and connected to a TV signal source.\n\nIf using an over-the-air antenna, adjust its placement or direction. For best results, place it high and near a window and scan again.</string> + <!-- Description for channel scanning result menu when no channel was found with network + tuners --> + <string name="nt_result_not_found_description">The scan did not find any channels. Verify the + network tuner is powered on and connected to a TV signal source.\n\nIf using an over-the-air + antenna, adjust its placement or direction. For best results, place it high and near a + window and scan again.</string> <!-- Menu items for channel scanning result menu when no channel was found --> <string-array name="ut_result_not_found_choices"> <item>Scan again</item> @@ -167,7 +179,12 @@ <!-- Content text and info of the recommendation card to launch the setup application of USB tuner TV input for scanning channels. --> <string name="ut_setup_recommendation_card_title">USB TV Tuner setup</string> + <!-- Content text and info of the recommendation card to launch the setup application of + network tuner TV input for scanning channels. --> + <string name="nt_setup_recommendation_card_title">Network TV Tuner setup</string> - <!-- Message when usb tuner device is unplugged. [CHAR LIMIT=NONE] --> - <string name="msg_usb_device_detached">USB TV tuner disconnected.</string> + <!-- Message when USB tuner device is unplugged or disconnected. [CHAR LIMIT=NONE] --> + <string name="msg_usb_tuner_disconnected">USB TV tuner disconnected.</string> + <!-- Message when Network tuner device is unplugged or disconnected. [CHAR LIMIT=NONE] --> + <string name="msg_network_tuner_disconnected">Network tuner disconnected.</string> </resources> diff --git a/usbtuner-res/values/styles.xml b/usbtuner-res/values/styles.xml deleted file mode 100644 index c79319ba..00000000 --- a/usbtuner-res/values/styles.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 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. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="ut_guidance_anchor"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/ut_guidance_anchor_height</item> - </style> - <style name="ut_guidance_container"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:background">@null</item> - <item name="android:clipToPadding">false</item> - <item name="android:clipChildren">false</item> - </style> - <style name="ut_guidance_title"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_alignWithParentIfMissing">true</item> - <item name="android:layout_below">@id/guidance_anchor_space</item> - <item name="android:ellipsize">end</item> - <item name="android:fontFamily">sans-serif-light</item> - <item name="android:maxLines">@integer/ut_guidance_title_max_lines</item> - <item name="android:textColor">@color/ut_guidance_title_text</item> - <item name="android:textSize">@dimen/ut_guidance_title_text_size</item> - </style> - <style name="ut_guidance_breadcrumb"> - <item name="android:layout_above">@id/guidance_title</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_alignWithParentIfMissing">true</item> - <item name="android:ellipsize">end</item> - <item name="android:fontFamily">sans-serif-condensed</item> - <item name="android:singleLine">true</item> - <item name="android:textColor">@color/ut_guidance_breadcrumb_text</item> - <item name="android:textSize">@dimen/ut_guidance_breadcrumb_text_size</item> - </style> - <style name="ut_guidance_desc"> - <item name="android:layout_below">@id/guidance_title</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginTop">@dimen/ut_guidance_description_margin_top</item> - <item name="android:layout_alignWithParentIfMissing">true</item> - <item name="android:ellipsize">end</item> - <item name="android:fontFamily">sans-serif</item> - <item name="android:maxLines">@integer/ut_guidance_description_max_lines</item> - <item name="android:textColor">@color/ut_guidance_description_text</item> - <item name="android:textSize">@dimen/ut_guidance_description_text_size</item> - </style> - <style name="ut_guidedactions_container"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:background">@null</item> - <item name="android:clipToPadding">false</item> - <item name="android:clipChildren">false</item> - </style> - <style name="ut_guidedactions_anchor"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/ut_guidedactions_anchor_height</item> - </style> - <style name="ut_guidedactions_null_selector"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/ut_guidedactions_selector_height</item> - <item name="android:layout_below">@id/guidedactions_anchor_space</item> - <item name="android:background">@null</item> - </style> - <style name="ut_guidedactions_list"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_below">@id/guidedactions_anchor_space</item> - <item name="android:background">@null</item> - <item name="android:clipToPadding">false</item> - <item name="android:clipChildren">false</item> - <item name="android:focusable">true</item> - </style> - <style name="ut_guidedactions_item_container"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/ut_guidedactions_item_height</item> - <item name="android:background">@drawable/ut_selector_background</item> - <item name="android:focusable">true</item> - <item name="android:paddingStart">@dimen/ut_guidedactions_item_padding_start</item> - <item name="android:paddingEnd">@dimen/ut_guidedactions_item_padding_end</item> - <item name="android:paddingTop">@dimen/ut_guidedactions_item_padding_top</item> - <item name="android:paddingBottom">@dimen/ut_guidedactions_item_padding_bottom</item> - </style> - <style name="ut_guidedactions_item_checkmark"> - <item name="android:layout_width">@dimen/lb_guidedactions_item_checkmark_diameter</item> - <item name="android:layout_height">@dimen/lb_guidedactions_item_checkmark_diameter</item> - <item name="android:visibility">gone</item> - </style> - <style name="ut_guidedactions_item_title"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:ellipsize">end</item> - <item name="android:fontFamily">sans-serif-condensed</item> - <item name="android:singleLine">true</item> - <item name="android:textColor">@color/ut_guidedactions_title_text</item> - <item name="android:textSize">14sp</item> - <item name="android:background">@null</item> - </style> - <style name="ut_guidedactions_item_chevron"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:visibility">gone</item> - </style> -</resources> |