diff options
Diffstat (limited to 'common/res/values')
| -rw-r--r-- | common/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | common/res/values/strings.xml | 32 | ||||
| -rw-r--r-- | common/res/values/styles.xml | 6 | ||||
| -rw-r--r-- | common/res/values/themes.xml | 1 |
4 files changed, 24 insertions, 22 deletions
diff --git a/common/res/values/dimens.xml b/common/res/values/dimens.xml index 9d6e0e67..be534898 100644 --- a/common/res/values/dimens.xml +++ b/common/res/values/dimens.xml @@ -16,10 +16,6 @@ --> <resources> - <!-- Setup screen --> - <dimen name="setup_fragment_enter_from">300dp</dimen> - <dimen name="setup_fragment_enter_to">-300dp</dimen> - <!-- Guided step fragment --> <dimen name="setup_guidedstep_guidance_section_width_2pane">600dp</dimen> <dimen name="setup_guidedstep_guidance_section_width_3pane">476dp</dimen> @@ -27,10 +23,7 @@ <dimen name="setup_guidedactions_selector_margin_start">24dp</dimen> <dimen name="setup_guidedactions_selector_margin_end">24dp</dimen> <dimen name="setup_guidedactions_selector_margin_top">220dp</dimen> - <dimen name="setup_guidedactions_item_container_padding_start">40dp</dimen> - <dimen name="setup_guidedactions_item_container_padding_end">40dp</dimen> <dimen name="setup_guidedactions_vertical_padding">12dp</dimen> - <dimen name="setup_guidedactions_vertical_spacing">5dp</dimen> <item name="setup_guidedactions_width_weight" format="float" type="string">1</item> <dimen name="setup_guidedactions_item_delimiter_padding">10dp</dimen> diff --git a/common/res/values/strings.xml b/common/res/values/strings.xml index e5b9b625..ec029136 100644 --- a/common/res/values/strings.xml +++ b/common/res/values/strings.xml @@ -17,16 +17,32 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="action_text_done">Done</string> - <!-- The episode display format with season and episode number used in series details view. --> + <string name="action_text_skip">Skip</string> + <!-- The episode display format with season and episode number used in series details view. + "S" is an abbreviation for Season and "Ep." is an abbreviation for episode. ":" is used as a separator. + For example, "S1: Ep. 1"--> <string name="display_episode_number_format">S<xliff:g id="season_number" example="1">%1$s</xliff:g>: Ep.<xliff:g id="episode_number" example="1">%2$s</xliff:g></string> - <!-- The episode display format with episode number used in series details view. --> + <!-- The episode display format with episode number used in series details view. + "Ep." is an abbreviation for episode. + For example, "Ep. 1" --> <string name="display_episode_number_format_no_season_number">Ep.<xliff:g id="episode_number" example="1">%1$s</xliff:g></string> - <!-- The episode title format displayed on the info banner. For example, "S1: Ep. 1 Winter is coming". --> + <!-- The episode title format displayed on the info banner. + "S" is an abbreviation for Season and Ep. is an abbreviation for episode. ":" is used as a separator. + For example, "S1: Ep. 1 Winter is coming". --> <string name="display_episode_title_format">S<xliff:g id="season_number" example="1">%1$s</xliff:g>: Ep. <xliff:g id="episode_number" example="1">%2$s</xliff:g> <xliff:g id="episode_title" example="Winter is Coming">%3$s</xliff:g></string> - <!-- The episode title format displayed on the info banner when the season number is not available. For example, "Ep. 1807 Headline News". --> + <!-- The episode title format displayed on the info banner when the season number is not available. + "Ep." is an abbreviation for episode. + For example, "Ep. 1807 Headline News". --> <string name="display_episode_title_format_no_season_number">Ep. <xliff:g id="episode_number" example="1807">%1$s</xliff:g> <xliff:g id="episode_title" example="Headline News">%2$s</xliff:g></string> - <!-- Program title with season and episode number used in DVR card views. --> - <string name="program_title_with_episode_number"><xliff:g id="programName" example="Big bang theory">%1$s</xliff:g> S<xliff:g id="seasonNumber" example="1">%2$s</xliff:g>: Ep. <xliff:g id="episodeNumber" example="12">%3$s</xliff:g></string> - <!-- Program title with episode number used in DVR card views. --> - <string name="program_title_with_episode_number_no_season"><xliff:g id="programName" example="Big bang theory">%1$s</xliff:g> Ep. <xliff:g id="episodeNumber" example="12">%2$s</xliff:g></string> + <!-- Program title with season and episode number used in DVR card views. + HTML tag <i> is a placeholder for styling episode number part. + "S" is an abbreviation for Season and "Ep." is an abbreviation for episode. ":" is used as a separator. + For example "Big bang theory <i>S1: Ep. 12</i>" --> + <string name="program_title_with_episode_number"><xliff:g id="programName" example="Big bang theory">%1$s</xliff:g> <![CDATA[<i>]]>S<xliff:g id="seasonNumber" example="1">%2$s</xliff:g>: Ep. <xliff:g id="episodeNumber" example="12">%3$s</xliff:g><![CDATA[</i>]]></string> + <!-- Program title with episode number used in DVR card views. + HTML tag <i> is a placeholder for styling episode number part. + "S" is an abbreviation for Season and "Ep." is an abbreviation for episode. ":" is used as a separator. + For example "Big bang theory <i>Ep. 12</i>" + --> + <string name="program_title_with_episode_number_no_season"><xliff:g id="programName" example="Big bang theory">%1$s</xliff:g> <![CDATA[<i>]]>Ep. <xliff:g id="episodeNumber" example="12">%2$s</xliff:g><![CDATA[</i>]]></string> </resources> diff --git a/common/res/values/styles.xml b/common/res/values/styles.xml index 3c3c71c9..50ef08f1 100644 --- a/common/res/values/styles.xml +++ b/common/res/values/styles.xml @@ -57,15 +57,9 @@ <item name="android:textSize">16sp</item> </style> - <style name="Widget.Setup.GuidedActionsListStyle" parent="Widget.Leanback.GuidedActionsListStyle"> - <item name="android:elevation">0dp</item> - </style> - <style name="Widget.Setup.GuidedActionItemContainerStyle" parent="Widget.Leanback.GuidedActionItemContainerStyle"> <item name="android:layout_height">64dp</item> <item name="android:paddingBottom">@dimen/setup_guidedactions_vertical_padding</item> - <item name="android:paddingEnd">@dimen/setup_guidedactions_item_container_padding_end</item> - <item name="android:paddingStart">@dimen/setup_guidedactions_item_container_padding_start</item> <item name="android:paddingTop">@dimen/setup_guidedactions_vertical_padding</item> <item name="android:transitionGroup">true</item> </style> diff --git a/common/res/values/themes.xml b/common/res/values/themes.xml index 598ae9a5..6016daf9 100644 --- a/common/res/values/themes.xml +++ b/common/res/values/themes.xml @@ -31,7 +31,6 @@ <item name="guidedActionItemDescriptionStyle">@style/Widget.Setup.GuidedActionItemDescriptionStyle</item> <item name="guidedActionsBackground">@color/common_setup_action_background</item> <item name="guidedActionsElevation">0dp</item> - <item name="guidedActionsListStyle">@style/Widget.Setup.GuidedActionsListStyle</item> <item name="guidedActionsSelectorDrawable">@drawable/setup_selector_background</item> <item name="guidedStepBackground">@android:color/transparent</item> <item name="setupCommonGuidanceBackground">@android:color/transparent</item> |