Update the prebuilts/sdk/current contents

Build id used: 1841989

Change-Id: Iff9faa6ea51c229e73f15db7dfdeac1fcada689c

35 files changed, 1270 insertions, 5 deletions

diff --git a/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_in_from_end.xml b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_in_from_end.xml
new file mode 100644
index 0000000..df3aca2
--- /dev/null
+++ b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_in_from_end.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="translationX"
+        android:valueFrom="@dimen/lb_guidedstep_slide_end_distance"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="alpha"
+        android:valueFrom="0.0"
+        android:valueTo="1.0"
+        android:valueType="floatType" />
+
+</set>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_in_from_start.xml b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_in_from_start.xml
new file mode 100644
index 0000000..49ddc12
--- /dev/null
+++ b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_in_from_start.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="translationX"
+        android:valueFrom="@dimen/lb_guidedstep_slide_start_distance"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="alpha"
+        android:valueFrom="0.0"
+        android:valueTo="1.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_out_to_end.xml b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_out_to_end.xml
new file mode 100644
index 0000000..d481273
--- /dev/null
+++ b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_out_to_end.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="translationX"
+        android:valueFrom="0.0"
+        android:valueTo="@dimen/lb_guidedstep_slide_end_distance"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_out_to_start.xml b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_out_to_start.xml
new file mode 100644
index 0000000..b172e86
--- /dev/null
+++ b/current/support/v17/leanback/res/animator-v21/lb_guidedstep_slide_out_to_start.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="translationX"
+        android:valueFrom="0.0"
+        android:valueTo="@dimen/lb_guidedstep_slide_start_distance"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:interpolator="@android:interpolator/fast_out_slow_in"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/animator/lb_decelerator_2.xml b/current/support/v17/leanback/res/animator/lb_decelerator_2.xml
new file mode 100644
index 0000000..b1f886a
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_decelerator_2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:factor="2.0"/>
diff --git a/current/support/v17/leanback/res/animator/lb_guidance_entry.xml b/current/support/v17/leanback/res/animator/lb_guidance_entry.xml
new file mode 100644
index 0000000..e10d2ef
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidance_entry.xml
@@ -0,0 +1,54 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="sequentially">
+
+    <set android:ordering="together">
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_delay"
+            android:propertyName="translationX"
+            android:valueFrom="@dimen/lb_guidance_entry_translationX"
+            android:valueTo="@dimen/lb_guidance_entry_translationX"
+            android:valueType="floatType" />
+
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_delay"
+            android:propertyName="alpha"
+            android:valueFrom="0.0"
+            android:valueTo="0.0"
+            android:valueType="floatType" />
+    </set>
+
+    <set android:ordering="together">
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_duration"
+            android:interpolator="@android:interpolator/decelerate_quad"
+            android:propertyName="translationX"
+            android:valueFrom="@dimen/lb_guidance_entry_translationX"
+            android:valueTo="0.0"
+            android:valueType="floatType" />
+
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_duration"
+            android:interpolator="@android:interpolator/decelerate_quad"
+            android:propertyName="alpha"
+            android:valueFrom="0.0"
+            android:valueTo="1.0"
+            android:valueType="floatType" />
+    </set>
+
+</set>
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_entry.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_entry.xml
new file mode 100644
index 0000000..ec6c655
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_entry.xml
@@ -0,0 +1,53 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="sequentially">
+
+    <set android:ordering="together">
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_delay"
+            android:propertyName="translationX"
+            android:valueFrom="@dimen/lb_guidedactions_entry_translationX"
+            android:valueTo="@dimen/lb_guidedactions_entry_translationX"
+            android:valueType="floatType" />
+
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_delay"
+            android:propertyName="alpha"
+            android:valueFrom="0.0"
+            android:valueTo="0.0"
+            android:valueType="floatType" />
+    </set>
+
+    <set android:ordering="together">
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_duration"
+            android:interpolator="@android:interpolator/decelerate_quad"
+            android:propertyName="translationX"
+            android:valueFrom="@dimen/lb_guidedactions_entry_translationX"
+            android:valueTo="0.0"
+            android:valueType="floatType" />
+
+        <objectAnimator
+            android:duration="@integer/lb_guidedstep_entry_animation_duration"
+            android:interpolator="@android:interpolator/decelerate_quad"
+            android:propertyName="alpha"
+            android:valueFrom="0.0"
+            android:valueTo="1.0"
+            android:valueType="floatType" />
+    </set>
+</set>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_item_checked.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_item_checked.xml
new file mode 100644
index 0000000..463b9f7
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_item_checked.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/lb_guidedactions_item_animation_duration"
+    android:propertyName="alpha"
+    android:valueFrom="0.0"
+    android:valueTo="1.0"
+    android:valueType="floatType" />
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_item_pressed.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_item_pressed.xml
new file mode 100644
index 0000000..d00e13b
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_item_pressed.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/lb_guidedactions_item_animation_duration"
+    android:propertyName="alpha"
+    android:valueFrom="1.0"
+    android:valueTo="0.2"
+    android:valueType="floatType" />
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_item_unchecked.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_item_unchecked.xml
new file mode 100644
index 0000000..86525c8
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_item_unchecked.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/lb_guidedactions_item_animation_duration"
+    android:propertyName="alpha"
+    android:valueFrom="1.0"
+    android:valueTo="0.0"
+    android:valueType="floatType" />
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_item_unpressed.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_item_unpressed.xml
new file mode 100644
index 0000000..0cf30a4
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_item_unpressed.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/lb_guidedactions_item_animation_duration"
+    android:propertyName="alpha"
+    android:valueFrom="0.2"
+    android:valueTo="1.0"
+    android:valueType="floatType" />
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_selector_hide.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_selector_hide.xml
new file mode 100644
index 0000000..f829eb3
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_selector_hide.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/lb_guidedactions_animation_duration"
+    android:propertyName="alpha"
+    android:valueFrom="1.0"
+    android:valueTo="0.0"
+    android:interpolator="@animator/lb_decelerator_2"
+    android:valueType="floatType" />
diff --git a/current/support/v17/leanback/res/animator/lb_guidedactions_selector_show.xml b/current/support/v17/leanback/res/animator/lb_guidedactions_selector_show.xml
new file mode 100644
index 0000000..e8d69e5
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedactions_selector_show.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together">
+
+    <objectAnimator
+        android:duration="@integer/lb_guidedactions_animation_duration"
+        android:propertyName="alpha"
+        android:valueFrom="0"
+        android:valueTo="1.0"
+        android:interpolator="@animator/lb_decelerator_2"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@integer/lb_guidedactions_animation_duration"
+        android:propertyName="scaleY"
+        android:interpolator="@animator/lb_decelerator_2"
+        android:valueType="floatType" />
+</set>
diff --git a/current/support/v17/leanback/res/animator/lb_guidedstep_slide_in_from_end.xml b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_in_from_end.xml
new file mode 100644
index 0000000..1dacdbc
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_in_from_end.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="translationX"
+        android:valueFrom="@dimen/lb_guidedstep_slide_end_distance"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="alpha"
+        android:valueFrom="0.0"
+        android:valueTo="1.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/animator/lb_guidedstep_slide_in_from_start.xml b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_in_from_start.xml
new file mode 100644
index 0000000..3c01324
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_in_from_start.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="translationX"
+        android:valueFrom="@dimen/lb_guidedstep_slide_start_distance"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="alpha"
+        android:valueFrom="0.0"
+        android:valueTo="1.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/animator/lb_guidedstep_slide_out_to_end.xml b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_out_to_end.xml
new file mode 100644
index 0000000..879a0cf
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_out_to_end.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="translationX"
+        android:valueFrom="0.0"
+        android:valueTo="@dimen/lb_guidedstep_slide_end_distance"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/animator/lb_guidedstep_slide_out_to_start.xml b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_out_to_start.xml
new file mode 100644
index 0000000..4c9af82
--- /dev/null
+++ b/current/support/v17/leanback/res/animator/lb_guidedstep_slide_out_to_start.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="together" >
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="translationX"
+        android:valueFrom="0.0"
+        android:valueTo="@dimen/lb_guidedstep_slide_start_distance"
+        android:valueType="floatType" />
+
+    <objectAnimator
+        android:duration="@android:integer/config_longAnimTime"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0"
+        android:valueType="floatType" />
+
+</set>
diff --git a/current/support/v17/leanback/res/drawable-hdpi/lb_ic_guidedactions_item_chevron.png b/current/support/v17/leanback/res/drawable-hdpi/lb_ic_guidedactions_item_chevron.png
new file mode 100644
index 0000000..f06c02d
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable-hdpi/lb_ic_guidedactions_item_chevron.png
diff --git a/current/support/v17/leanback/res/drawable-mdpi/lb_ic_guidedactions_item_chevron.png b/current/support/v17/leanback/res/drawable-mdpi/lb_ic_guidedactions_item_chevron.png
new file mode 100644
index 0000000..149e214
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable-mdpi/lb_ic_guidedactions_item_chevron.png
diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_guidedactions_item_chevron.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_guidedactions_item_chevron.png
new file mode 100644
index 0000000..6a65ccf
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_guidedactions_item_chevron.png
diff --git a/current/support/v17/leanback/res/drawable/lb_guidedactions_item_checkmark.xml b/current/support/v17/leanback/res/drawable/lb_guidedactions_item_checkmark.xml
new file mode 100644
index 0000000..ec7903b
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable/lb_guidedactions_item_checkmark.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+
+    <size
+        android:height="@dimen/lb_guidedactions_item_checkmark_diameter"
+        android:width="@dimen/lb_guidedactions_item_checkmark_diameter" />
+
+    <solid android:color="@color/lb_tv_white" />
+
+</shape>
diff --git a/current/support/v17/leanback/res/layout/lb_guidance.xml b/current/support/v17/leanback/res/layout/lb_guidance.xml
new file mode 100644
index 0000000..28c0220
--- /dev/null
+++ b/current/support/v17/leanback/res/layout/lb_guidance.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <RelativeLayout
+        style="?attr/guidanceContainerStyle" >
+
+        <ImageView
+            android:id="@+id/guidance_icon"
+            style="?attr/guidanceIconStyle"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/guidance_title"
+            style="?attr/guidanceTitleStyle" />
+
+        <TextView
+            android:id="@+id/guidance_breadcrumb"
+            style="?attr/guidanceBreadcrumbStyle" />
+
+        <TextView
+            android:id="@+id/guidance_description"
+            style="?attr/guidanceDescriptionStyle" />
+
+    </RelativeLayout>
+
+</FrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_guidedactions.xml b/current/support/v17/leanback/res/layout/lb_guidedactions.xml
new file mode 100644
index 0000000..43617c9
--- /dev/null
+++ b/current/support/v17/leanback/res/layout/lb_guidedactions.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!-- Layout for the settings list fragment -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <RelativeLayout
+        style="?attr/guidedActionsContainerStyle" >
+
+        <FrameLayout
+            android:id="@+id/guidedactions_selector"
+            style="?attr/guidedActionsSelectorStyle" />
+
+        <android.support.v17.leanback.widget.VerticalGridView
+            android:id="@+id/guidedactions_list"
+            style="?attr/guidedActionsListStyle" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_guidedactions_item.xml b/current/support/v17/leanback/res/layout/lb_guidedactions_item.xml
new file mode 100644
index 0000000..4e41454
--- /dev/null
+++ b/current/support/v17/leanback/res/layout/lb_guidedactions_item.xml
@@ -0,0 +1,51 @@
+<?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.
+-->
+<!-- Layout for an action item displayed in the 2 pane actions fragment. -->
+<android.support.v17.leanback.widget.NonOverlappingLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/guidedActionItemContainerStyle" >
+
+    <ImageView
+        android:id="@+id/guidedactions_item_checkmark"
+        style="?attr/guidedActionItemCheckmarkStyle"
+        tools:ignore="ContentDescription" />
+
+    <ImageView
+        android:id="@+id/guidedactions_item_icon"
+        style="?attr/guidedActionItemIconStyle"
+        tools:ignore="ContentDescription" />
+
+    <android.support.v17.leanback.widget.NonOverlappingLinearLayout
+        android:id="@+id/guidedactions_item_content"
+        style="?attr/guidedActionItemContentStyle" >
+
+        <TextView
+            android:id="@+id/guidedactions_item_title"
+            style="?attr/guidedActionItemTitleStyle" />
+
+        <TextView
+            android:id="@+id/guidedactions_item_description"
+            style="?attr/guidedActionItemDescriptionStyle" />
+    </android.support.v17.leanback.widget.NonOverlappingLinearLayout>
+
+    <ImageView
+        android:id="@+id/guidedactions_item_chevron"
+        style="?attr/guidedActionItemChevronStyle"
+        tools:ignore="ContentDescription" />
+
+</android.support.v17.leanback.widget.NonOverlappingLinearLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml b/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml
new file mode 100644
index 0000000..6e0b7ad
--- /dev/null
+++ b/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!-- Layout for the frame of a 2 pane actions fragment. -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <FrameLayout
+        android:id="@+id/content_fragment"
+        android:layout_width="@dimen/lb_guidedstep_guidance_section_width"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true" />
+
+    <FrameLayout
+        android:id="@+id/action_fragment"
+        android:layout_width="@dimen/lb_guidedactions_section_width_with_shadow"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
index 82913d9..a671954 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
@@ -16,14 +16,16 @@
 -->
 
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
-  android:duration="500" >
+   >
   <fade
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:startDelay="325"
       android:duration="150"/>
   <changeBounds
-      android:interpolator="@android:interpolator/linear_out_slow_in">
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:duration="500">
   </changeBounds>
   <changeImageTransform
-      android:interpolator="@android:interpolator/linear_out_slow_in"/>
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:duration="500"/>
 </transitionSet>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/values-en-rAU/strings.xml b/current/support/v17/leanback/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..ed22ccd
--- /dev/null
+++ b/current/support/v17/leanback/res/values-en-rAU/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright (C) 2014 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"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="orb_search_action" msgid="5651268540267663887">"Search Action"</string>
+    <string name="lb_search_bar_hint" msgid="8325490927970116252">"Search"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Speak to search"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="731953341987346903">"Play"</string>
+    <string name="lb_playback_controls_pause" msgid="6189521112079849518">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="8569951318244687220">"Fast-Forward"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="1058753672110224526">"Fast Forward %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2227196334132350684">"Rewind"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="1640629531440849942">"Rewind %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="2946499493161095772">"Skip Next"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="2326801832933178348">"Skip Previous"</string>
+    <string name="lb_playback_controls_more_actions" msgid="2330770008796987655">"More Actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="6530420347129222601">"Deselect Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1577637924003500946">"Select Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="4498041193172964797">"Deselect Thumb Down"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="2936020280629424365">"Select Thumb Down"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="87476947476529036">"Repeat None"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="6730354406289599000">"Repeat All"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="3285202316452203619">"Repeat One"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="1099874107835264529">"Enable Shuffle"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="8388150597335115226">"Disable Shuffle"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="202415780019335254">"Enable High Quality"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="8637371582779057866">"Disable High Quality"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2429655367176440226">"Enable Closed Captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="6133362019475930048">"Disable Closed Captioning"</string>
+</resources>
diff --git a/current/support/v17/leanback/res/values-ldrtl/dimens.xml b/current/support/v17/leanback/res/values-ldrtl/dimens.xml
new file mode 100644
index 0000000..9f54273
--- /dev/null
+++ b/current/support/v17/leanback/res/values-ldrtl/dimens.xml
@@ -0,0 +1,25 @@
+<?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>
+    <!-- GuidedStepFragment -->
+    <dimen name="lb_guidedstep_slide_start_distance">200dp</dimen>
+    <dimen name="lb_guidedstep_slide_end_distance">-200dp</dimen>
+    <dimen name="lb_guidance_entry_translationX">120dp</dimen>
+    <dimen name="lb_guidedactions_entry_translationX">-384dp</dimen>
+    <!-- end GuidedStepFragment -->
+
+</resources>
diff --git a/current/support/v17/leanback/res/values-v19/themes.xml b/current/support/v17/leanback/res/values-v19/themes.xml
index a466ad7..53befec 100644
--- a/current/support/v17/leanback/res/values-v19/themes.xml
+++ b/current/support/v17/leanback/res/values-v19/themes.xml
@@ -20,5 +20,8 @@
         <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item>
         <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item>
         <item name="defaultBrandColor">@color/lb_default_brand_color</item>
+
+        <item name="android:windowOverscan">true</item>
+        <item name="guidedStepTheme">@style/Theme.Leanback.GuidedStep</item>
     </style>
 </resources>
diff --git a/current/support/v17/leanback/res/values-v21/themes.xml b/current/support/v17/leanback/res/values-v21/themes.xml
index 9061674..3b48dae 100644
--- a/current/support/v17/leanback/res/values-v21/themes.xml
+++ b/current/support/v17/leanback/res/values-v21/themes.xml
@@ -21,5 +21,8 @@
         <item name="playbackControlsIconHighlightColor">?android:attr/colorAccent</item>
         <item name="defaultBrandColor">?android:attr/colorPrimary</item>
         <item name="android:colorPrimary">@color/lb_default_brand_color</item>
+
+        <item name="android:windowOverscan">true</item>
+        <item name="guidedStepTheme">@style/Theme.Leanback.GuidedStep</item>
     </style>
 </resources>
diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml
index 923ba3e..656e38e 100644
--- a/current/support/v17/leanback/res/values/attrs.xml
+++ b/current/support/v17/leanback/res/values/attrs.xml
@@ -278,8 +278,180 @@
         <attr name="overlayDimActiveLevel" format="fraction" />
         <!-- Default level of dimming for dimmed views. -->
         <attr name="overlayDimDimmedLevel" format="fraction" />
+    </declare-styleable>
+
+    <declare-styleable name="LeanbackGuidedStepTheme">
+
+        <!-- Theme attribute for the overall theme used in a GuidedStepFragment. The Leanback themes
+             set the default for this, but a custom theme that does not derive from a leanback theme
+             can set this to <code>@style/Theme.Leanback.GuidedStep</code> in order to specify the
+             default GuidedStepFragment styles. -->
+        <attr name="guidedStepTheme" format="reference" />
+
+        <!-- @hide
+             Theme attribute used to inspect theme inheritance. -->
+        <attr name="guidedStepThemeFlag" format="boolean" />
+
+        <!-- Theme attribute for the animation used when a guided step element is animated in on
+             fragment stack push. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedstep_slide_in_from_end}. -->
+        <attr name="guidedStepEntryAnimation" format="reference" />
+        <!-- Theme attribute for the animation used when a guided step element is animated out on
+             fragment stack push. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedstep_slide_out_to_start}. -->
+        <attr name="guidedStepExitAnimation" format="reference" />
+        <!-- Theme attribute for the animation used when a guided step element is animated in on
+             fragment stack pop. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedstep_slide_in_from_start}. -->
+        <attr name="guidedStepReentryAnimation" format="reference" />
+        <!-- Theme attribute for the animation used when a guided step element is animated out on
+             fragment stack pop. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedstep_slide_out_to_end}. -->
+        <attr name="guidedStepReturnAnimation" format="reference" />
+
+        <!-- Theme attribute for the animation used when the guidance is animated in at activity
+             start. Default is {@link android.support.v17.leanback.R.animator#lb_guidance_entry}.
+             -->
+        <attr name="guidanceEntryAnimation" format="reference" />
+        <!-- Theme attribute for the style of the main container in a GuidanceStylist. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidanceContainerStyle}.-->
+        <attr name="guidanceContainerStyle" format="reference" />
+        <!-- Theme attribute for the style of the title in a GuidanceStylist. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidanceTitleStyle}. -->
+        <attr name="guidanceTitleStyle" format="reference" />
+        <!-- Theme attribute for the style of the description in a GuidanceStylist. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidanceDescriptionStyle}. -->
+        <attr name="guidanceDescriptionStyle" format="reference" />
+        <!-- Theme attribute for the style of the breadcrumb in a GuidanceStylist. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidanceBreadcrumbStyle}. -->
+        <attr name="guidanceBreadcrumbStyle" format="reference" />
+        <!-- Theme attribute for the style of the icon in a GuidanceStylist. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidanceIconStyle}. -->
+        <attr name="guidanceIconStyle" format="reference" />
+
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when the actions
+             list is animated in at activity start. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_entry}. -->
+        <attr name="guidedActionsEntryAnimation" format="reference" />
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when the action
+             selector is animated in at activity start. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_selector_show}. -->
+        <attr name="guidedActionsSelectorShowAnimation" format="reference" />
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when the action
+             selector is animated in at activity start. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_selector_hide}. -->
+        <attr name="guidedActionsSelectorHideAnimation" format="reference" />
+        <!-- Theme attribute for the style of the container in a GuidedActionsPresenter. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionsContainerStyle}. -->
+        <attr name="guidedActionsContainerStyle" format="reference" />
+        <!-- Theme attribute for the style of the item selector in a GuidedActionsPresenter. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionsSelectorStyle}. -->
+        <attr name="guidedActionsSelectorStyle" format="reference" />
+        <!-- Theme attribute for the style of the list in a GuidedActionsPresenter. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionsListStyle}.-->
+        <attr name="guidedActionsListStyle" format="reference" />
+
+        <!-- Theme attribute for the style of the container of a single action in a
+             GuidedActionsPresenter. Default is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemContainerStyle}. -->
+        <attr name="guidedActionItemContainerStyle" format="reference" />
+        <!-- Theme attribute for the style of an action's checkmark in a GuidedActionsPresenter.
+             Default is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemCheckmarkStyle}. -->
+        <attr name="guidedActionItemCheckmarkStyle" format="reference" />
+        <!-- Theme attribute for the style of an action's icon in a GuidedActionsPresenter. Default
+             is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemIconStyle}. -->
+        <attr name="guidedActionItemIconStyle" format="reference" />
+        <!-- Theme attribute for the style of an action's content in a GuidedActionsPresenter.
+             Default is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemContentStyle}. -->
+        <attr name="guidedActionItemContentStyle" format="reference" />
+        <!-- Theme attribute for the style of an action's title in a GuidedActionsPresenter. Default
+             is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemTitleStyle}. -->
+        <attr name="guidedActionItemTitleStyle" format="reference" />
+        <!-- Theme attribute for the style of an action's description in a GuidedActionsPresenter.
+             Default is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemDescriptionStyle}. -->
+        <attr name="guidedActionItemDescriptionStyle" format="reference" />
+        <!-- Theme attribute for the style of an action's chevron decoration in a
+             GuidedActionsPresenter. Default is {@link
+             android.support.v17.leanback.R.style#Widget_Leanback_GuidedActionItemChevronStyle}. -->
+        <attr name="guidedActionItemChevronStyle" format="reference" />
+
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when an action
+             is checked. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_item_checked}. -->
+        <attr name="guidedActionCheckedAnimation" format="reference" />
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when an action
+             is unchecked. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_item_unchecked}. -->
+        <attr name="guidedActionUncheckedAnimation" format="reference" />
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when an action
+             is pressed. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_item_pressed}. -->
+        <attr name="guidedActionPressedAnimation" format="reference" />
+        <!-- Theme attribute for the animation used in a GuidedActionsPresenter when an action
+             is unpressed. Default is {@link
+             android.support.v17.leanback.R.animator#lb_guidedactions_item_unpressed}. -->
+        <attr name="guidedActionUnpressedAnimation" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the alpha value of the chevron
+             decoration when its action is enabled. Default is {@link
+             android.support.v17.leanback.R.string#lb_guidedactions_item_enabled_chevron_alpha}. -->
+        <attr name="guidedActionEnabledChevronAlpha" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the alpha value of the chevron
+             decoration when its action is disabled. Default is {@link
+             android.support.v17.leanback.R.string#lb_guidedactions_item_disabled_chevron_alpha}. -->
+        <attr name="guidedActionDisabledChevronAlpha" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the width of the text area of
+             a single action when there is an icon present. Default is {@link
+             android.support.v17.leanback.R.dimen#lb_guidedactions_item_text_width}. -->
+        <attr name="guidedActionContentWidth" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the width of the text area of
+             a single action when there is no icon present. Default is {@link
+             android.support.v17.leanback.R.dimen#lb_guidedactions_item_text_width_no_icon}. -->
+        <attr name="guidedActionContentWidthNoIcon" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the max lines of the title text
+             view when the action's isMultilineDescription is set to false. Default is {@link
+             android.support.v17.leanback.R.integer#lb_guidedactions_item_title_min_lines}. -->
+        <attr name="guidedActionTitleMinLines" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the max lines of the title text
+             view when the action's isMultilineDescription is set to true. Default is {@link
+             android.support.v17.leanback.R.integer#lb_guidedactions_item_title_max_lines}. -->
+        <attr name="guidedActionTitleMaxLines" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the max lines of the title text
+             view when the action's isMultilineDescription is set to false. Default is {@link
+             android.support.v17.leanback.R.integer#lb_guidedactions_item_description_min_lines}. -->
+        <attr name="guidedActionDescriptionMinLines" format="reference" />
+        <!-- Theme attribute used in a GuidedActionsPresenter for the vertical padding between
+             action views in the list. Default is {@link
+             android.support.v17.leanback.R.dimen#lb_guidedactions_vertical_padding}. -->
+        <attr name="guidedActionVerticalPadding" format="reference" />
 
     </declare-styleable>
 
+    <attr name="cardGravity">
+        <!-- Push child views to the left of the container. -->
+        <flag name="left" value="0x03" />
+        <!-- Push child views to the right of the container. -->
+        <flag name="right" value="0x05" />
+        <!-- Push child views to the beginning of the container. -->
+        <flag name="start" value="0x00800003" />
+        <!-- Push child views to the end of the container. -->
+        <flag name="end" value="0x00800005" />
+    </attr>
+
+    <declare-styleable name="StackedLayout">
+        <!-- Defines the width of child views in this layout -->
+        <attr name="cardWidth" format="dimension" />
+        <!-- Defines the distance to shift child views away from the edge when another child
+             is added -->
+        <attr name="stackShift" format="dimension" />
+        <!-- Defines the amount to increment the elevation of each added child -->
+        <attr name="elevationIncrement" format="dimension" />
+        <!-- Defines which edge child views are laid out on -->
+        <attr name="cardGravity" />
+    </declare-styleable>
 
 </resources>
diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml
index ba65d2f..1549af9 100644
--- a/current/support/v17/leanback/res/values/colors.xml
+++ b/current/support/v17/leanback/res/values/colors.xml
@@ -65,4 +65,14 @@
     <color name="lb_playback_controls_time_text_color">#B2EEEEEE</color>
 
     <color name="lb_search_plate_hint_text_color">#FFCCCCCC</color>
+
+    <!-- GuidedStepFragment -->
+    <color name="lb_tv_white">#FFCCCCCC</color>
+
+    <!-- refactor naming here -->
+    <color name="lb_guidedactions_background">#FF111111</color>
+    <color name="lb_guidedactions_selector_color">#26FFFFFF</color>
+    <color name="lb_guidedactions_item_unselected_text_color">#FFF1F1F1</color>
+    <!-- end refactor naming -->
+
 </resources>
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index 8c4c198..c248af7 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -206,4 +206,45 @@
 
     <dimen name="lb_rounded_rect_corner_radius">2dp</dimen>
 
+    <!-- GuidedStepFragment -->
+    <dimen name="lb_guidedstep_guidance_section_width">576dp</dimen>
+    <dimen name="lb_guidedstep_slide_start_distance">-200dp</dimen>
+    <dimen name="lb_guidedstep_slide_end_distance">200dp</dimen>
+
+    <dimen name="lb_guidance_entry_translationX">-120dp</dimen>
+
+    <dimen name="lb_guidedactions_entry_translationX">384dp</dimen>
+    <dimen name="lb_guidedactions_section_width">384dp</dimen>
+    <dimen name="lb_guidedactions_section_width_with_shadow">400dp</dimen>
+    <dimen name="lb_guidedactions_elevation">12dp</dimen>
+    <dimen name="lb_guidedactions_selector_min_height">8dp</dimen>
+    <dimen name="lb_guidedactions_vertical_padding">12dp</dimen>
+
+    <item name="lb_guidedactions_item_unselected_text_alpha" format="float" type="string">1.00</item>
+    <item name="lb_guidedactions_item_unselected_description_text_alpha" format="float" type="string">0.50</item>
+    <item name="lb_guidedactions_item_enabled_chevron_alpha" format="float" type="string">1.00</item>
+    <item name="lb_guidedactions_item_disabled_chevron_alpha" format="float" type="string">0.50</item>
+
+    <dimen name="lb_guidedactions_item_text_width">248dp</dimen>
+    <dimen name="lb_guidedactions_item_text_width_no_icon">284dp</dimen>
+    <dimen name="lb_guidedactions_item_min_height">64dp</dimen>
+    <dimen name="lb_guidedactions_item_start_padding">20dp</dimen>
+    <dimen name="lb_guidedactions_item_end_padding">28dp</dimen>
+    <dimen name="lb_guidedactions_item_delimiter_padding">4dp</dimen>
+    <dimen name="lb_guidedactions_item_checkmark_diameter">8dp</dimen>
+    <dimen name="lb_guidedactions_item_icon_width">32dp</dimen>
+    <dimen name="lb_guidedactions_item_icon_height">32dp</dimen>
+    <dimen name="lb_guidedactions_item_title_font_size">18sp</dimen>
+    <dimen name="lb_guidedactions_item_description_font_size">12sp</dimen>
+
+    <integer name="lb_guidedstep_entry_animation_delay">550</integer>
+    <integer name="lb_guidedstep_entry_animation_duration">250</integer>
+
+    <integer name="lb_guidedactions_item_animation_duration">100</integer>
+    <integer name="lb_guidedactions_animation_duration">150</integer>
+    <integer name="lb_guidedactions_item_title_min_lines">1</integer>
+    <integer name="lb_guidedactions_item_title_max_lines">3</integer>
+    <integer name="lb_guidedactions_item_description_min_lines">2</integer>
+    <!-- end GuidedStepFragment -->
+
 </resources>
diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml
index 71c5122..3ee2821 100644
--- a/current/support/v17/leanback/res/values/styles.xml
+++ b/current/support/v17/leanback/res/values/styles.xml
@@ -290,4 +290,175 @@
         <item name="closed_captioning">@drawable/lb_ic_cc</item>
     </style>
 
+    <!-- Style for the main container view in a GuidanceStylist's default layout. -->
+    <style name="Widget.Leanback.GuidanceContainerStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingStart">48dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:clipToPadding">false</item>
+    </style>
+
+    <!-- Style for the title view in a GuidanceStylist's default layout. -->
+    <style name="Widget.Leanback.GuidanceTitleStyle">
+        <item name="android:layout_toStartOf">@id/guidance_icon</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:layout_centerVertical">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:gravity">end</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:textColor">#FFF1F1F1</item>
+        <item name="android:textSize">36sp</item>
+    </style>
+
+    <!-- Style for the description view in a GuidanceStylist's default layout. -->
+    <style name="Widget.Leanback.GuidanceDescriptionStyle">
+        <item name="android:layout_below">@id/guidance_title</item>
+        <item name="android:layout_toStartOf">@id/guidance_icon</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</item>
+        <item name="android:gravity">end</item>
+        <item name="android:maxLines">6</item>
+        <item name="android:textColor">#88F1F1F1</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:lineSpacingExtra">3dp</item>
+    </style>
+
+    <!-- Style for the breadcrumb view in a GuidanceStylist's default layout. -->
+    <style name="Widget.Leanback.GuidanceBreadcrumbStyle">
+        <item name="android:layout_above">@id/guidance_title</item>
+        <item name="android:layout_toStartOf">@id/guidance_icon</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">#88F1F1F1</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <!-- Style for the icon view in a GuidanceStylist's default layout. -->
+    <style name="Widget.Leanback.GuidanceIconStyle">
+        <item name="android:layout_width">140dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:maxHeight">280dp</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+
+    <!-- Style for the container view in a GuidedActionsStylist's default layout. -->
+    <style name="Widget.Leanback.GuidedActionsContainerStyle">
+        <item name="android:layout_width">@dimen/lb_guidedactions_section_width</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:background">@color/lb_guidedactions_background</item>
+        <item name="android:elevation">@dimen/lb_guidedactions_elevation</item>
+    </style>
+
+    <!-- Style for the selector view in a GuidedActionsStylist's default layout. -->
+    <style name="Widget.Leanback.GuidedActionsSelectorStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/lb_guidedactions_selector_min_height</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:alpha">0</item>
+        <item name="android:background">@color/lb_guidedactions_selector_color</item>
+    </style>
+
+    <!-- Style for the vertical grid of actions in a GuidedActionsStylist's default layout. -->
+    <style name="Widget.Leanback.GuidedActionsListStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:focusable">true</item>
+    </style>
+
+
+    <!-- Style for an action's container in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemContainerStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:focusable">true</item>
+        <item name="android:minHeight">@dimen/lb_guidedactions_item_min_height</item>
+        <item name="android:paddingBottom">@dimen/lb_guidedactions_vertical_padding</item>
+        <item name="android:paddingStart">@dimen/lb_guidedactions_item_start_padding</item>
+        <item name="android:paddingEnd">@dimen/lb_guidedactions_item_end_padding</item>
+        <item name="android:paddingTop">@dimen/lb_guidedactions_vertical_padding</item>
+    </style>
+
+    <!-- Style for an action's checkmark in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemCheckmarkStyle">
+        <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:layout_gravity">center</item>
+        <item name="android:layout_marginEnd">@dimen/lb_guidedactions_item_delimiter_padding</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:src">@drawable/lb_guidedactions_item_checkmark</item>
+        <item name="android:visibility">invisible</item>
+    </style>
+
+    <!-- Style for an action's icon in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemIconStyle">
+        <item name="android:layout_width">@dimen/lb_guidedactions_item_icon_width</item>
+        <item name="android:layout_height">@dimen/lb_guidedactions_item_icon_height</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_marginEnd">@dimen/lb_guidedactions_item_delimiter_padding</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <!-- Style for an action's text content in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemContentStyle">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <!-- Style for an action's title in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemTitleStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:alpha">@string/lb_guidedactions_item_unselected_text_alpha</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:fontFamily">sans-serif-condensed</item>
+        <item name="android:maxLines">@integer/lb_guidedactions_item_title_min_lines</item>
+        <item name="android:textColor">@color/lb_guidedactions_item_unselected_text_color</item>
+        <item name="android:textSize">@dimen/lb_guidedactions_item_title_font_size</item>
+    </style>
+
+    <!-- Style for an action's description in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemDescriptionStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:alpha">@string/lb_guidedactions_item_unselected_description_text_alpha</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:fontFamily">sans-serif-condensed</item>
+        <item name="android:maxLines">@integer/lb_guidedactions_item_description_min_lines</item>
+        <item name="android:textColor">@color/lb_guidedactions_item_unselected_text_color</item>
+        <item name="android:textSize">@dimen/lb_guidedactions_item_description_font_size</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <!-- Style for an action's chevron in a GuidedActionsStylist's default item layout. -->
+    <style name="Widget.Leanback.GuidedActionItemChevronStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_marginStart">@dimen/lb_guidedactions_item_delimiter_padding</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:src">@drawable/lb_ic_guidedactions_item_chevron</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
 </resources>
diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml
index 457798b..cd331e9 100644
--- a/current/support/v17/leanback/res/values/themes.xml
+++ b/current/support/v17/leanback/res/values/themes.xml
@@ -22,12 +22,13 @@
         <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item>
         <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item>
         <item name="defaultBrandColor">@color/lb_default_brand_color</item>
+
+        <item name="android:windowOverscan">true</item>
+        <item name="guidedStepTheme">@style/Theme.Leanback.GuidedStep</item>
     </style>
 
     <style name="Theme.Leanback" parent="Theme.LeanbackBase">
 
-        <item name="android:windowOverscan">true</item>
-
         <item name="baseCardViewStyle">@style/Widget.Leanback.BaseCardViewStyle</item>
         <item name="imageCardViewStyle">@style/Widget.Leanback.ImageCardViewStyle</item>
 
@@ -86,6 +87,7 @@
         <item name="overlayDimMaskColor">@color/lb_view_dim_mask_color</item>
         <item name="overlayDimActiveLevel">@fraction/lb_view_active_level</item>
         <item name="overlayDimDimmedLevel">@fraction/lb_view_dimmed_level</item>
+
     </style>
 
     <style name="Theme.Leanback.Browse" parent="Theme.Leanback">
@@ -100,4 +102,48 @@
         <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item>
     </style>
 
+    <style name="Theme.Leanback.GuidedStep" parent="Theme.LeanbackBase">
+        <item name="guidedStepThemeFlag">true</item>
+
+        <item name="guidedStepEntryAnimation">@animator/lb_guidedstep_slide_in_from_end</item>
+        <item name="guidedStepExitAnimation">@animator/lb_guidedstep_slide_out_to_start</item>
+        <item name="guidedStepReentryAnimation">@animator/lb_guidedstep_slide_in_from_start</item>
+        <item name="guidedStepReturnAnimation">@animator/lb_guidedstep_slide_out_to_end</item>
+        <item name="guidanceEntryAnimation">@animator/lb_guidance_entry</item>
+        <item name="guidedActionsEntryAnimation">@animator/lb_guidedactions_entry</item>
+
+        <item name="guidanceContainerStyle">@style/Widget.Leanback.GuidanceContainerStyle</item>
+        <item name="guidanceIconStyle">@style/Widget.Leanback.GuidanceIconStyle</item>
+        <item name="guidanceTitleStyle">@style/Widget.Leanback.GuidanceTitleStyle</item>
+        <item name="guidanceBreadcrumbStyle">@style/Widget.Leanback.GuidanceBreadcrumbStyle</item>
+        <item name="guidanceDescriptionStyle">@style/Widget.Leanback.GuidanceDescriptionStyle</item>
+
+        <item name="guidedActionsContainerStyle">@style/Widget.Leanback.GuidedActionsContainerStyle</item>
+        <item name="guidedActionsSelectorStyle">@style/Widget.Leanback.GuidedActionsSelectorStyle</item>
+        <item name="guidedActionsListStyle">@style/Widget.Leanback.GuidedActionsListStyle</item>
+        <item name="guidedActionsSelectorShowAnimation">@animator/lb_guidedactions_selector_show</item>
+        <item name="guidedActionsSelectorHideAnimation">@animator/lb_guidedactions_selector_hide</item>
+
+        <item name="guidedActionItemContainerStyle">@style/Widget.Leanback.GuidedActionItemContainerStyle</item>
+        <item name="guidedActionItemCheckmarkStyle">@style/Widget.Leanback.GuidedActionItemCheckmarkStyle</item>
+        <item name="guidedActionItemIconStyle">@style/Widget.Leanback.GuidedActionItemIconStyle</item>
+        <item name="guidedActionItemContentStyle">@style/Widget.Leanback.GuidedActionItemContentStyle</item>
+        <item name="guidedActionItemTitleStyle">@style/Widget.Leanback.GuidedActionItemTitleStyle</item>
+        <item name="guidedActionItemDescriptionStyle">@style/Widget.Leanback.GuidedActionItemDescriptionStyle</item>
+        <item name="guidedActionItemChevronStyle">@style/Widget.Leanback.GuidedActionItemChevronStyle</item>
+
+        <item name="guidedActionCheckedAnimation">@animator/lb_guidedactions_item_checked</item>
+        <item name="guidedActionUncheckedAnimation">@animator/lb_guidedactions_item_unchecked</item>
+        <item name="guidedActionPressedAnimation">@animator/lb_guidedactions_item_pressed</item>
+        <item name="guidedActionUnpressedAnimation">@animator/lb_guidedactions_item_unpressed</item>
+        <item name="guidedActionEnabledChevronAlpha">@string/lb_guidedactions_item_enabled_chevron_alpha</item>
+        <item name="guidedActionDisabledChevronAlpha">@string/lb_guidedactions_item_disabled_chevron_alpha</item>
+        <item name="guidedActionContentWidth">@dimen/lb_guidedactions_item_text_width</item>
+        <item name="guidedActionContentWidthNoIcon">@dimen/lb_guidedactions_item_text_width_no_icon</item>
+        <item name="guidedActionTitleMinLines">@integer/lb_guidedactions_item_title_min_lines</item>
+        <item name="guidedActionTitleMaxLines">@integer/lb_guidedactions_item_title_max_lines</item>
+        <item name="guidedActionDescriptionMinLines">@integer/lb_guidedactions_item_description_min_lines</item>
+        <item name="guidedActionVerticalPadding">@dimen/lb_guidedactions_vertical_padding</item>
+    </style>
+
 </resources>