aboutsummaryrefslogtreecommitdiff
path: root/common/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'common/res/values')
-rw-r--r--common/res/values/dimens.xml5
-rw-r--r--common/res/values/strings.xml1
-rw-r--r--common/res/values/styles.xml6
-rw-r--r--common/res/values/themes.xml1
4 files changed, 1 insertions, 12 deletions
diff --git a/common/res/values/dimens.xml b/common/res/values/dimens.xml
index 9d6e0e67..746b12c9 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>
@@ -30,7 +26,6 @@
<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..97fbea97 100644
--- a/common/res/values/strings.xml
+++ b/common/res/values/strings.xml
@@ -17,6 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="action_text_done">Done</string>
+ <string name="action_text_skip">Skip</string>
<!-- The episode display format with season and episode number used in series details view. -->
<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. -->
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>