Update SDK and support lib to mnc-release - MRA37D #2147760

Bug: 23032150
Change-Id: I55b6ba8a5d6febe033c91414b1b609c641f2f625

5 files changed, 15 insertions, 12 deletions

diff --git a/current/support/design/res/layout/design_layout_snackbar_include.xml b/current/support/design/res/layout/design_layout_snackbar_include.xml
index f1fd08e..0e0cde4 100644
--- a/current/support/design/res/layout/design_layout_snackbar_include.xml
+++ b/current/support/design/res/layout/design_layout_snackbar_include.xml
@@ -31,19 +31,19 @@
             android:layout_gravity="center_vertical|left|start"
             android:ellipsize="end"/>
 
-    <TextView
+    <Button
             android:id="@+id/snackbar_action"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
             android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
             android:layout_gravity="center_vertical|right|end"
-            android:background="?attr/selectableItemBackground"
             android:paddingTop="@dimen/design_snackbar_padding_vertical"
             android:paddingBottom="@dimen/design_snackbar_padding_vertical"
             android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
             android:paddingRight="@dimen/design_snackbar_padding_horizontal"
             android:visibility="gone"
-            android:textAppearance="@style/TextAppearance.Design.Snackbar.Action"/>
+            android:textColor="?attr/colorAccent"
+            style="?attr/borderlessButtonStyle"/>
 
 </merge>
\ No newline at end of file
diff --git a/current/support/design/res/layout/design_navigation_menu.xml b/current/support/design/res/layout/design_navigation_menu.xml
index 02aab37..02b7aad 100644
--- a/current/support/design/res/layout/design_navigation_menu.xml
+++ b/current/support/design/res/layout/design_navigation_menu.xml
@@ -22,4 +22,5 @@
         android:paddingBottom="@dimen/design_navigation_padding_bottom"
         android:clipToPadding="false"
         android:divider="@null"
+        android:scrollbars="vertical"
         android:listSelector="?attr/selectableItemBackground"/>
diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index 2dfeb41..785308a 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -161,6 +161,9 @@
         <attr name="errorEnabled" format="boolean"/>
         <!-- TextAppearance of any error message displayed -->
         <attr name="errorTextAppearance" format="reference"/>
+        <attr name="android:textColorHint"/>
+        <!-- Whether to animate hint state changes. -->
+        <attr name="hintAnimationEnabled" format="boolean"/>
     </declare-styleable>
 
     <declare-styleable name="SnackbarLayout">
@@ -290,6 +293,11 @@
             <!-- Push title to the end of its container, not changing its size. -->
             <flag name="end" value="0x00800005"/>
         </attr>
+
+        <!-- Whether the CollapsingToolbarLayout should draw its own shrinking/growing title. -->
+        <attr name="titleEnabled" format="boolean"/>
+        <!-- The title to show when titleEnabled is set to true. -->
+        <attr name="title"/>
     </declare-styleable>
 
     <declare-styleable name="CollapsingAppBarLayout_LayoutParams">
diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml
index 034809d..c7f8cef 100644
--- a/current/support/design/res/values/dimens.xml
+++ b/current/support/design/res/values/dimens.xml
@@ -16,7 +16,7 @@
 -->
 <resources>
 
-    <dimen name="design_fab_elevation">8dp</dimen>
+    <dimen name="design_fab_elevation">6dp</dimen>
     <dimen name="design_fab_translation_z_pressed">6dp</dimen>
     <dimen name="design_fab_content_size">24dp</dimen>
     <dimen name="design_fab_size_normal">56dp</dimen>
@@ -24,7 +24,7 @@
     <dimen name="design_fab_border_width">0.5dp</dimen>
 
     <dimen name="design_navigation_max_width">320dp</dimen>
-    <dimen name="design_navigation_elevation">12dp</dimen>
+    <dimen name="design_navigation_elevation">16dp</dimen>
     <dimen name="design_navigation_icon_padding">32dp</dimen>
     <dimen name="design_navigation_icon_size">24dp</dimen>
     <dimen name="design_navigation_separator_vertical_padding">8dp</dimen>
@@ -36,7 +36,7 @@
 
     <dimen name="design_snackbar_min_width">-1px</dimen>
     <dimen name="design_snackbar_max_width">-1px</dimen>
-    <dimen name="design_snackbar_elevation">2dp</dimen>
+    <dimen name="design_snackbar_elevation">6dp</dimen>
     <dimen name="design_snackbar_background_corner_radius">0dp</dimen>
 
     <dimen name="design_snackbar_padding_horizontal">12dp</dimen>
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index 8736183..e75d805 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -77,10 +77,6 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-    <style name="TextAppearance.Design.Snackbar.Action" parent="TextAppearance.AppCompat.Button">
-        <item name="android:textColor">?colorAccent</item>
-    </style>
-
     <style name="Widget.Design.Snackbar" parent="android:Widget">
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:minWidth">@dimen/design_snackbar_min_width</item>
@@ -94,8 +90,6 @@
 
     <style name="Widget.Design.CollapsingToolbar" parent="android:Widget">
         <item name="expandedTitleMargin">32dp</item>
-        <item name="expandedTitleTextAppearance">@style/TextAppearance.Design.CollapsingToolbar.Expanded</item>
-        <item name="collapsedTitleTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
         <item name="statusBarScrim">?attr/colorPrimaryDark</item>
     </style>