Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K

Android 6.0.1 release 22

1 files changed, 62 insertions, 0 deletions

diff --git a/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml b/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml
new file mode 100644
index 000000000..feb9f036a
--- /dev/null
+++ b/samples/SupportLeanbackShowcase/app/src/main/res/values/themes.xml
@@ -0,0 +1,62 @@
+<?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>
+
+    <style name="Theme.Example.Leanback" parent="Theme.Leanback">
+        <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">
+        <item name="android:windowBackground">@color/card_examples_background</item>
+    </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>
+
+    <style name="Theme.Example.LeanbackDialog" parent="Theme.Leanback.GuidedStep">
+        <item name="guidedActionsContainerStyle">@style/DialogActionsContainerStyle</item>
+    </style>
+
+    <style name="Theme.Example.LeanbackPreferences" parent="Theme.Leanback">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:colorPrimary">@color/settings_background</item>
+    </style>
+
+    <style name="Theme.Example.LeanbackDetails" parent="Theme.Leanback.Details">
+        <item name="android:colorPrimary">@color/detail_view_actionbar_background</item>
+        <item name="android:windowBackground">@drawable/background_canyon</item>
+     </style>
+
+    <style name="Theme.Example.LeanbackMusic" parent="Theme.Example.Leanback">
+        <item name="android:windowBackground">@drawable/background_sax</item>
+     </style>
+
+</resources>