DO NOT MERGE ANYWHERE. Update support library. Build ID: 2022988.
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index ec01319..0264338 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index fb35e70..5b0080d 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
Binary files differ
diff --git a/current/support/design/res/layout-sw600dp/layout_snackbar.xml b/current/support/design/res/layout-sw600dp/layout_snackbar.xml
index 6605408..b68395a 100644
--- a/current/support/design/res/layout-sw600dp/layout_snackbar.xml
+++ b/current/support/design/res/layout-sw600dp/layout_snackbar.xml
@@ -19,5 +19,5 @@
class="android.support.design.widget.Snackbar$SnackbarLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom|center_vertical"
+ android:layout_gravity="bottom|center_horizontal"
style="@style/Widget.Design.Snackbar" />
\ No newline at end of file
diff --git a/current/support/design/res/layout/layout_tab_icon.xml b/current/support/design/res/layout/layout_tab_icon.xml
new file mode 100644
index 0000000..6464d1f
--- /dev/null
+++ b/current/support/design/res/layout/layout_tab_icon.xml
@@ -0,0 +1,21 @@
+<?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.
+ -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"/>
\ No newline at end of file
diff --git a/current/support/design/res/layout/layout_tab_text.xml b/current/support/design/res/layout/layout_tab_text.xml
new file mode 100644
index 0000000..a83bb3d
--- /dev/null
+++ b/current/support/design/res/layout/layout_tab_text.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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:maxLines="2"/>
\ No newline at end of file
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index 4e03029..067846c 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -23,7 +23,7 @@
<item name="elevation">@dimen/fab_elevation</item>
<item name="pressedTranslationZ">@dimen/fab_translation_z_pressed</item>
<item name="rippleColor">?attr/colorControlHighlight</item>
- <item name="borderWidth">0dp</item>
+ <item name="borderWidth">@dimen/fab_border_width</item>
</style>
<style name="Widget.Design.ScrimInsetsFrameLayout" parent="">
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 3741eed..0081cd5 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index 8695467..6f9ebde 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 1b40680..10ca7a8 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
Binary files differ
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 71cf1a0..02cd281 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_card_info_text_fade.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_card_info_text_fade.png
deleted file mode 100644
index a09fdee..0000000
--- a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_card_info_text_fade.png
+++ /dev/null
Binary files differ
diff --git a/current/support/v17/leanback/res/layout/lb_image_card_view.xml b/current/support/v17/leanback/res/layout/lb_image_card_view.xml
index 38cfd4b..2261965 100644
--- a/current/support/v17/leanback/res/layout/lb_image_card_view.xml
+++ b/current/support/v17/leanback/res/layout/lb_image_card_view.xml
@@ -27,23 +27,21 @@
android:scaleType="centerCrop"
android:adjustViewBounds="true"
android:contentDescription="@null" />
- <android.support.v17.leanback.widget.NonOverlappingFrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- lb:layout_viewType="info" >
- <RelativeLayout
+ <android.support.v17.leanback.widget.NonOverlappingRelativeLayout
+ lb:layout_viewType="info"
android:id="@+id/info_field"
android:layout_width="match_parent"
android:layout_height="@dimen/lb_basic_card_info_height"
- android:padding="@dimen/lb_basic_card_info_padding"
+ android:paddingStart="@dimen/lb_basic_card_info_padding_horizontal"
+ android:paddingEnd="@dimen/lb_basic_card_info_padding_horizontal"
+ android:paddingTop="@dimen/lb_basic_card_info_padding_top"
android:layout_centerHorizontal="true" >
<TextView
android:id="@+id/title_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
- android:layout_marginTop="@dimen/lb_basic_card_info_text_margin"
- android:layout_marginStart="@dimen/lb_basic_card_info_text_margin"
+ android:layout_marginBottom="@dimen/lb_basic_card_info_text_margin"
android:maxLines="1"
android:fontFamily="sans-serif-condensed"
android:textColor="@color/lb_basic_card_title_text_color"
@@ -53,10 +51,9 @@
android:id="@+id/content_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_below="@id/title_text"
android:layout_alignParentStart="true"
- android:layout_alignParentBottom="true"
- android:layout_marginStart="@dimen/lb_basic_card_info_text_margin"
- android:layout_marginBottom="@dimen/lb_basic_card_info_text_margin"
+ android:layout_toStartOf="@+id/extra_badge"
android:maxLines="1"
android:fontFamily="sans-serif-condensed"
android:textColor="@color/lb_basic_card_content_text_color"
@@ -66,21 +63,11 @@
android:id="@+id/extra_badge"
android:layout_width="@dimen/lb_basic_card_info_badge_size"
android:layout_height="@dimen/lb_basic_card_info_badge_size"
- android:layout_alignParentBottom="true"
+ android:layout_marginStart="@dimen/lb_basic_card_info_badge_margin"
+ android:layout_alignBottom="@id/content_text"
android:layout_alignParentEnd="true"
android:scaleType="fitCenter"
android:visibility="gone"
android:contentDescription="@null" />
- <ImageView
- android:id="@+id/fade_mask"
- android:src="@drawable/lb_ic_card_info_text_fade"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/lb_basic_card_info_badge_size"
- android:layout_alignParentBottom="true"
- android:layout_toStartOf="@id/extra_badge"
- android:scaleType="fitCenter"
- android:visibility="gone"
- android:contentDescription="@null" />
- </RelativeLayout>
- </android.support.v17.leanback.widget.NonOverlappingFrameLayout>
+ </android.support.v17.leanback.widget.NonOverlappingRelativeLayout>
</merge>
diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml
index 1549af9..e63c58b 100644
--- a/current/support/v17/leanback/res/values/colors.xml
+++ b/current/support/v17/leanback/res/values/colors.xml
@@ -46,10 +46,10 @@
<color name="lb_speech_orb_recording">#ff4343</color>
<color name="lb_speech_orb_not_recording_icon">#555555</color>
- <color name="lb_basic_card_bg_color">#FF3B3B3B</color>
- <color name="lb_basic_card_info_bg_color">#FF3B3B3B</color>
+ <color name="lb_basic_card_bg_color">#FF263238</color>
+ <color name="lb_basic_card_info_bg_color">#FF37474F</color>
<color name="lb_basic_card_title_text_color">#FFEEEEEE</color>
- <color name="lb_basic_card_content_text_color">#99EEEEEE</color>
+ <color name="lb_basic_card_content_text_color">#B3EEEEEE</color>
<color name="lb_default_brand_color">#FF455A64</color>
<color name="lb_default_search_color">#FFFFAA3F</color>
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index c7d9145..c7664b9 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -200,11 +200,14 @@
<dimen name="lb_basic_card_main_width">140dp</dimen>
<dimen name="lb_basic_card_main_height">188dp</dimen>
<dimen name="lb_basic_card_info_height">52dp</dimen>
- <dimen name="lb_basic_card_info_padding">6dp</dimen>
- <dimen name="lb_basic_card_info_text_margin">2dp</dimen>
- <dimen name="lb_basic_card_title_text_size">16sp</dimen>
+ <dimen name="lb_basic_card_info_height_no_content">34dp</dimen>
+ <dimen name="lb_basic_card_info_padding_top">7dp</dimen>
+ <dimen name="lb_basic_card_info_padding_horizontal">11dp</dimen>
+ <dimen name="lb_basic_card_info_text_margin">1dp</dimen>
+ <dimen name="lb_basic_card_title_text_size">14sp</dimen>
<dimen name="lb_basic_card_content_text_size">12sp</dimen>
<dimen name="lb_basic_card_info_badge_size">16dp</dimen>
+ <dimen name="lb_basic_card_info_badge_margin">4dp</dimen>
<!-- z based shadow -->
<dimen name="lb_material_shadow_normal_z">6dp</dimen>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index 68c2047..fe96a7d 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index 8dad4af..8b9e700 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/appcompat/res/values-v21/styles_base.xml b/current/support/v7/appcompat/res/values-v21/styles_base.xml
index 1bf90ef..241cb04 100644
--- a/current/support/v7/appcompat/res/values-v21/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/styles_base.xml
@@ -174,6 +174,8 @@
<style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" />
+ <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText" />
+
<style name="Base.Widget.AppCompat.RatingBar" parent="android:Widget.Material.RatingBar" />
<style name="Base.Widget.AppCompat.Button" parent="android:Widget.Material.Button" />
diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml
index b38c6ad..0ac20d5 100644
--- a/current/support/v7/appcompat/res/values/styles.xml
+++ b/current/support/v7/appcompat/res/values/styles.xml
@@ -194,9 +194,7 @@
<style name="Widget.AppCompat.SearchView" parent="Base.Widget.AppCompat.SearchView" />
<style name="Widget.AppCompat.SearchView.ActionBar" parent="Base.Widget.AppCompat.SearchView.ActionBar" />
- <style name="Widget.AppCompat.EditText"
- parent="Base.Widget.AppCompat.EditText">
- </style>
+ <style name="Widget.AppCompat.EditText" parent="Base.Widget.AppCompat.EditText"/>
<style name="Widget.AppCompat.CompoundButton.Switch" parent="Base.Widget.AppCompat.CompoundButton.Switch" />
diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml
index 3e2c841..5db9d05 100644
--- a/current/support/v7/appcompat/res/values/themes_base.xml
+++ b/current/support/v7/appcompat/res/values/themes_base.xml
@@ -571,7 +571,7 @@
<item name="isLightTheme">true</item>
</style>
- <style name="Base.ThemeOverlay.AppCompat.Dark">
+ <style name="Base.ThemeOverlay.AppCompat.Dark" parent="Platform.ThemeOverlay.AppCompat.Dark">
<item name="android:windowBackground">@color/background_material_dark</item>
<item name="android:colorForeground">@color/bright_foreground_material_dark</item>
<item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item>
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index 66235d9..0f34db2 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index 1a1a94d..5f3f8f0 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index c2d3309..605ebb7 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index 3bb30d8..f5ce915 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index 93c83e0..c9679a1 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
