DO NOT MERGE ANYWHERE Update prebuilt sdk system and support @NRC42B 2601594 (NRC42B) from NYC-Release
Bug: 27164492
Change-Id: I17bf46887e12140720542bed8b1f6d08f9c70e33
diff --git a/current/android.jar b/current/android.jar
index 08f34bd..d2cb9f8 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 2b40111..1931f24 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/customtabs/libs/android-support-customtabs.jar b/current/support/customtabs/libs/android-support-customtabs.jar
index aa08b36..59a9dd9 100644
--- a/current/support/customtabs/libs/android-support-customtabs.jar
+++ b/current/support/customtabs/libs/android-support-customtabs.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 262e198..f7bc067 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/values/attrs.xml b/current/support/design/res/values/attrs.xml
index 7a9e3c1..c472fdf 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -365,6 +365,9 @@
<attr name="bottomSheetDialogTheme" format="reference" />
<!-- Style to use for modal bottom sheets in this theme. -->
<attr name="bottomSheetStyle" format="reference" />
+
+ <!-- Text color used to indicate an error has occurred. -->
+ <attr name="textColorError" format="color" />
</declare-styleable>
</resources>
diff --git a/current/support/design/res/values/colors.xml b/current/support/design/res/values/colors.xml
index a958156..ebf6412 100644
--- a/current/support/design/res/values/colors.xml
+++ b/current/support/design/res/values/colors.xml
@@ -33,7 +33,8 @@
<!-- Shadow color for the furthest pixels of a shadow -->
<color name="design_fab_shadow_end_color">@android:color/transparent</color>
- <color name="design_textinput_error_color">#FFDD2C00</color>
+ <color name="design_textinput_error_color_light">#FFD50000</color>
+ <color name="design_textinput_error_color_dark">#FFFF6E6E</color>
<color name="design_snackbar_background_color">#323232</color>
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index 7111ad9..8753c63 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -71,13 +71,13 @@
</style>
<style name="TextAppearance.Design.Error" parent="TextAppearance.AppCompat.Caption">
- <item name="android:textColor">@color/design_textinput_error_color</item>
+ <item name="android:textColor">?attr/textColorError</item>
</style>
<style name="TextAppearance.Design.Counter" parent="TextAppearance.AppCompat.Caption"/>
<style name="TextAppearance.Design.Counter.Overflow" parent="TextAppearance.AppCompat.Caption">
- <item name="android:textColor">@color/design_textinput_error_color</item>
+ <item name="android:textColor">?attr/textColorError</item>
</style>
<style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance">
diff --git a/current/support/design/res/values/themes.xml b/current/support/design/res/values/themes.xml
index 0e3b1b1..5768692 100644
--- a/current/support/design/res/values/themes.xml
+++ b/current/support/design/res/values/themes.xml
@@ -28,4 +28,22 @@
<item name="bottomSheetStyle">@style/Widget.Design.BottomSheet.Modal</item>
</style>
+ <style name="Theme.Design" parent="Theme.AppCompat">
+ <item name="textColorError">@color/design_textinput_error_color_dark</item>
+ </style>
+
+ <style name="Theme.Design.Light" parent="Theme.AppCompat.Light">
+ <item name="textColorError">@color/design_textinput_error_color_light</item>
+ </style>
+
+ <style name="Theme.Design.NoActionBar">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ </style>
+
+ <style name="Theme.Design.Light.NoActionBar">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ </style>
+
</resources>
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 ea67114..b9042a8 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 8d575ab..08652f6 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/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar
index c120906..4776610 100644
--- a/current/support/percent/libs/android-support-percent.jar
+++ b/current/support/percent/libs/android-support-percent.jar
Binary files differ
diff --git a/current/support/recommendation/libs/android-support-recommendation.jar b/current/support/recommendation/libs/android-support-recommendation.jar
index 19b92b5..72992de 100644
--- a/current/support/recommendation/libs/android-support-recommendation.jar
+++ b/current/support/recommendation/libs/android-support-recommendation.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 6b8dd11..461dee8 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/v14/preference/libs/android-support-v14-preference.jar b/current/support/v14/preference/libs/android-support-v14-preference.jar
index 0e6e994..a40084b 100644
--- a/current/support/v14/preference/libs/android-support-v14-preference.jar
+++ b/current/support/v14/preference/libs/android-support-v14-preference.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 626b944..aa7095c 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/transition-v21/lb_guidedstep_activity_enter_bottom.xml b/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter_bottom.xml
index 3a097e8..ac00e9c 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter_bottom.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter_bottom.xml
@@ -17,7 +17,7 @@
<transition class="android.support.v17.leanback.transition.FadeAndShortSlide"
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:custom="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:interpolator="@android:interpolator/fast_out_linear_in"
android:duration="@integer/lb_guidedstep_activity_background_fade_duration_ms"
- custom:lb_slideEdge="bottom" />
+ app:lb_slideEdge="bottom" />
diff --git a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
index 13132bf..d3995b9 100644
--- a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
+++ b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
Binary files differ
diff --git a/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml b/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml
index 9b978f3..97bb3f0 100644
--- a/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml
+++ b/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml
@@ -26,7 +26,7 @@
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
+ android:layout_gravity="start|center_vertical"
android:fontFamily="sans-serif-condensed"
android:textColor="?android:attr/colorAccent"
android:textSize="@dimen/lb_preference_category_text_size"/>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index f46c13b..e578e28 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 53fff8d..fa38f95 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/color/abc_btn_colored_borderless_text_material.xml b/current/support/v7/appcompat/res/color/abc_btn_colored_borderless_text_material.xml
new file mode 100644
index 0000000..f4a93b7
--- /dev/null
+++ b/current/support/v7/appcompat/res/color/abc_btn_colored_borderless_text_material.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!-- Used for the text of a borderless colored button. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/textColorSecondary" />
+ <item android:color="?attr/colorAccent"/>
+</selector>
\ No newline at end of file
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 b1d3006..d31f6f9 100644
--- a/current/support/v7/appcompat/res/values-v21/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/styles_base.xml
@@ -186,7 +186,9 @@
<style name="Base.Widget.AppCompat.Button.Borderless" parent="android:Widget.Material.Button.Borderless" />
- <style name="Base.Widget.AppCompat.Button.Borderless.Colored" parent="android:Widget.Material.Button.Borderless.Colored" />
+ <style name="Base.Widget.AppCompat.Button.Borderless.Colored" parent="android:Widget.Material.Button.Borderless.Colored">
+ <item name="android:textColor">@color/abc_btn_colored_borderless_text_material</item>
+ </style>
<style name="Base.Widget.AppCompat.ButtonBar" parent="android:Widget.Material.ButtonBar" />
diff --git a/current/support/v7/appcompat/res/values-v23/styles_base.xml b/current/support/v7/appcompat/res/values-v23/styles_base.xml
index 56563c7..e6be6b9 100644
--- a/current/support/v7/appcompat/res/values-v23/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v23/styles_base.xml
@@ -17,6 +17,8 @@
<resources>
+ <style name="Base.Widget.AppCompat.Button.Borderless.Colored" parent="android:Widget.Material.Button.Borderless.Colored" />
+
<style name="Base.Widget.AppCompat.Button.Colored" parent="android:Widget.Material.Button.Colored" />
<style name="Base.Widget.AppCompat.RatingBar.Indicator" parent="android:Widget.Material.RatingBar.Indicator" />
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index 85f8c22..8b808da 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -455,7 +455,7 @@
<!-- Colored borderless ink button -->
<style name="Base.Widget.AppCompat.Button.Borderless.Colored">
- <item name="android:textColor">?attr/colorAccent</item>
+ <item name="android:textColor">@color/abc_btn_colored_borderless_text_material</item>
</style>
<style name="Base.Widget.AppCompat.Button.ButtonBar.AlertDialog" parent="Widget.AppCompat.Button.Borderless.Colored">
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 6da8291..e2c1580 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 98df292..862da51 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 9db9219..8a8f128 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 33fb0e1..6d58b7c 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/preference/libs/android-support-v7-preference.jar b/current/support/v7/preference/libs/android-support-v7-preference.jar
index 8b8fb2c..c2ec615 100644
--- a/current/support/v7/preference/libs/android-support-v7-preference.jar
+++ b/current/support/v7/preference/libs/android-support-v7-preference.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 9654d1b..016c22d 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
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index 61e6d65..51878e8 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/system_current/android.jar b/system_current/android.jar
index 5024e6d..36fa265 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ
