diff options
Diffstat (limited to 'samples/SupportLeanbackShowcase/app/src/main/res')
3 files changed, 5 insertions, 9 deletions
diff --git a/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_grid_example.xml b/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_grid_example.xml index c8b0a3790..f3fcdeaac 100644 --- a/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_grid_example.xml +++ b/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_grid_example.xml @@ -16,7 +16,6 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:background="@drawable/background_food" android:layout_height="match_parent"> <fragment diff --git a/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_main.xml b/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_main.xml index e3c6889e2..9d2eda6c7 100644 --- a/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_main.xml +++ b/samples/SupportLeanbackShowcase/app/src/main/res/layout/activity_main.xml @@ -21,6 +21,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:deviceIds="tv" - android:background="@drawable/bg_living_room_wide" tools:ignore="MergeRootFrame"> </RelativeLayout> diff --git a/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml b/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml index 12343de7d..2f6822b69 100644 --- a/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml +++ b/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml @@ -16,25 +16,23 @@ <resources> <style name="Theme.Example.Leanback" parent="Theme.Leanback"> - <item name="android:windowEnterTransition">@android:transition/fade</item> - <item name="android:windowExitTransition">@android:transition/fade</item> - <item name="android:windowSharedElementExitTransition">@android:transition/move</item> - <item name="android:windowSharedElementEnterTransition">@android:transition/move</item> - <item name="android:windowAllowReturnTransitionOverlap">true</item> - <item name="android:windowAllowEnterTransitionOverlap">true</item> - <item name="android:windowContentTransitions">true</item> <item name="android:colorPrimary">#00A2B8</item> <item name="android:colorAccent">@color/accent</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item> </style> <style name="Theme.Example.LeanbackLauncher" parent="Theme.Example.Leanback"> + <item name="android:windowBackground">@drawable/bg_living_room_wide</item> <item name="browseRowsMarginTop">275dp</item> </style> <style name="Theme.Example.LeanbackBrowse" parent="Theme.Leanback.Browse"> </style> + <style name="Theme.Example.LeanbackVerticalGrid" parent="Theme.Leanback.VerticalGrid"> + <item name="android:windowBackground">@drawable/background_food</item> + </style> + <style name="Theme.Example.LeanbackWizard" parent="Theme.Leanback.GuidedStep"> <item name="guidedActionsContainerStyle">@style/WizardActionsContainerStyle</item> </style> |