DO NOT MERGE - Update prebuilt current SDK to 1466287
Copied files from lmp-mr1-dev branch at #1466287
http://android-build.corp.google.com/builds/git_lmp-mr1-dev-linux-sdk_arm64-sdk/1466287
Followed the instruction given at : goto/updateprebuilts
Change-Id: I5d81b9aa60f719a46b7e024f1ddbdf27416f4c0f
diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml
index bcdb152..896a80a 100644
--- a/current/support/v7/appcompat/res/values/attrs.xml
+++ b/current/support/v7/appcompat/res/values/attrs.xml
@@ -215,6 +215,9 @@
<!-- EditText background drawable. -->
<attr name="editTextBackground" format="reference" />
+ <!-- Default style for the Switch widget. -->
+ <attr name="switchStyle" format="reference" />
+
<!-- ============================ -->
<!-- SearchView styles and assets -->
<!-- ============================ -->
@@ -298,6 +301,9 @@
<!-- The color applied to framework buttons in their normal state. -->
<attr name="colorButtonNormal" format="color" />
+ <!-- The color applied to framework switch thumbs in their normal state. -->
+ <attr name="colorSwitchThumbNormal" format="color" />
+
</declare-styleable>
@@ -788,4 +794,27 @@
<attr name="android:id" />
</declare-styleable>
+ <declare-styleable name="SwitchCompat">
+ <!-- Drawable to use as the "thumb" that switches back and forth. -->
+ <attr name="android:thumb" />
+ <!-- Drawable to use as the "track" that the switch thumb slides within. -->
+ <attr name="track" format="reference" />
+ <!-- Text to use when the switch is in the checked/"on" state. -->
+ <attr name="android:textOn" />
+ <!-- Text to use when the switch is in the unchecked/"off" state. -->
+ <attr name="android:textOff" />
+ <!-- Amount of padding on either side of text within the switch thumb. -->
+ <attr name="thumbTextPadding" format="dimension" />
+ <!-- TextAppearance style for text displayed on the switch thumb. -->
+ <attr name="switchTextAppearance" format="reference" />
+ <!-- Minimum width for the switch component -->
+ <attr name="switchMinWidth" format="dimension" />
+ <!-- Minimum space between the switch and caption text -->
+ <attr name="switchPadding" format="dimension" />
+ <!-- Whether to split the track and leave a gap for the thumb drawable. -->
+ <attr name="splitTrack" format="boolean" />
+ <!-- Whether to draw on/off text. -->
+ <attr name="showText" format="boolean" />
+ </declare-styleable>
+
</resources>
diff --git a/current/support/v7/appcompat/res/values/colors.xml b/current/support/v7/appcompat/res/values/colors.xml
index 884387a..3214201 100644
--- a/current/support/v7/appcompat/res/values/colors.xml
+++ b/current/support/v7/appcompat/res/values/colors.xml
@@ -17,4 +17,6 @@
<color name="abc_search_url_text_normal">#7fa87f</color>
<color name="abc_search_url_text_selected">@android:color/black</color>
<color name="abc_search_url_text_pressed">@android:color/black</color>
+
+ <color name="abc_input_method_navigation_guard">@android:color/black</color>
</resources>
\ No newline at end of file
diff --git a/current/support/v7/appcompat/res/values/colors_material.xml b/current/support/v7/appcompat/res/values/colors_material.xml
index 8bed195..94448b5 100644
--- a/current/support/v7/appcompat/res/values/colors_material.xml
+++ b/current/support/v7/appcompat/res/values/colors_material.xml
@@ -17,15 +17,28 @@
<!-- Colors specific to Material themes. -->
<resources>
- <color name="background_material_dark">#ff212121</color>
- <color name="background_material_light">#fffafafa</color>
+ <color name="background_material_dark">#ff303030</color>
+ <color name="background_material_light">#ffeeeeee</color>
+ <color name="background_floating_material_dark">#ff424242</color>
+ <color name="background_floating_material_light">#ffeeeeee</color>
- <color name="ripple_material_light">#20444444</color>
- <color name="ripple_material_dark">#20ffffff</color>
+ <color name="primary_material_dark">#ff212121</color>
+ <color name="primary_material_light">#ffbdbdbd</color>
+ <color name="primary_dark_material_dark">#ff000000</color>
+ <color name="primary_dark_material_light">#ff757575</color>
+
+ <color name="ripple_material_dark">#40ffffff</color>
+ <color name="ripple_material_light">#40000000</color>
+
+ <color name="accent_material_light">@color/material_deep_teal_500</color>
+ <color name="accent_material_dark">@color/material_deep_teal_200</color>
<color name="button_material_dark">#ff5a595b</color>
<color name="button_material_light">#ffd6d7d7</color>
+ <color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
+ <color name="switch_thumb_normal_material_light">#fff1f1f1</color>
+
<color name="bright_foreground_material_dark">@android:color/white</color>
<color name="bright_foreground_material_light">@android:color/black</color>
<!-- White 50% -->
@@ -77,10 +90,8 @@
<color name="material_deep_teal_200">#ff80cbc4</color>
<color name="material_deep_teal_500">#ff009688</color>
- <color name="material_blue_grey_50">#ffeceff1</color>
- <color name="material_blue_grey_100">#ffcfd8dc</color>
<color name="material_blue_grey_800">#ff37474f</color>
<color name="material_blue_grey_900">#ff263238</color>
<color name="material_blue_grey_950">#ff21272b</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/dimens_material.xml b/current/support/v7/appcompat/res/values/dimens_material.xml
index d42e7b2..a620b31 100644
--- a/current/support/v7/appcompat/res/values/dimens_material.xml
+++ b/current/support/v7/appcompat/res/values/dimens_material.xml
@@ -38,8 +38,8 @@
<dimen name="abc_text_size_headline_material">24sp</dimen>
<dimen name="abc_text_size_title_material">20sp</dimen>
<dimen name="abc_text_size_subhead_material">16sp</dimen>
- <dimen name="abc_text_size_title_material_toolbar">@dimen/abc_text_size_title_material</dimen>
- <dimen name="abc_text_size_subtitle_material_toolbar">@dimen/abc_text_size_subhead_material</dimen>
+ <dimen name="abc_text_size_title_material_toolbar">20dp</dimen>
+ <dimen name="abc_text_size_subtitle_material_toolbar">16dp</dimen>
<dimen name="abc_text_size_menu_material">16sp</dimen>
<dimen name="abc_text_size_body_2_material">16sp</dimen>
<dimen name="abc_text_size_body_1_material">16sp</dimen>
diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml
index f931266..1b8b53b 100644
--- a/current/support/v7/appcompat/res/values/styles.xml
+++ b/current/support/v7/appcompat/res/values/styles.xml
@@ -118,16 +118,11 @@
parent="Base.TextAppearance.AppCompat.Widget.DropDownItem">
</style>
- <style name="Widget.AppCompat.Spinner"
- parent="Base.Widget.AppCompat.Spinner" />
+ <style name="Widget.AppCompat.Spinner" parent="Base.Widget.AppCompat.Spinner" />
<style name="Widget.AppCompat.Spinner.DropDown" />
- <style name="Widget.AppCompat.Spinner.DropDown.ActionBar" />
-
- <style name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar"
- parent="Base.Widget.AppCompat.Light.Spinner">
- </style>
+ <style name="Widget.AppCompat.Spinner.DropDown.ActionBar" parent="Base.Widget.AppCompat.Spinner.DropDown.ActionBar" />
<!-- This style has an extra indirection to properly set RTL attributes. See styles_rtl.xml -->
<style name="Widget.AppCompat.DropDownItem.Spinner" parent="RtlOverlay.Widget.AppCompat.Search.DropDown.Text" />
@@ -136,10 +131,6 @@
parent="Base.Widget.AppCompat.ListView.DropDown">
</style>
- <style name="Widget.AppCompat.Light.ListView.DropDown"
- parent="Base.Widget.AppCompat.Light.ListView.DropDown">
- </style>
-
<style name="TextAppearance.Widget.AppCompat.ExpandedMenu.Item"
parent="Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item">
</style>
@@ -147,10 +138,6 @@
<style name="Widget.AppCompat.ListPopupWindow" parent="Base.Widget.AppCompat.ListPopupWindow">
</style>
- <style name="Widget.AppCompat.Light.ListPopupWindow"
- parent="Base.Widget.AppCompat.Light.ListPopupWindow">
- </style>
-
<style name="Widget.AppCompat.PopupMenu.Overflow"
parent="Base.Widget.AppCompat.PopupMenu.Overflow">
</style>
@@ -218,6 +205,8 @@
parent="Base.Widget.AppCompat.EditText">
</style>
+ <style name="Widget.AppCompat.CompoundButton.Switch" parent="Base.Widget.AppCompat.CompoundButton.Switch" />
+
<!-- Toolbar -->
<style name="Widget.AppCompat.Toolbar" parent="Base.Widget.AppCompat.Toolbar" />
@@ -279,6 +268,9 @@
<style name="TextAppearance.AppCompat.Small.Inverse" parent="Base.TextAppearance.AppCompat.Small.Inverse" />
+ <style name="TextAppearance.AppCompat.Button" parent="Base.TextAppearance.AppCompat.Button" />
+
+ <style name="TextAppearance.AppCompat.Widget.Switch" parent="Base.TextAppearance.AppCompat.Widget.Switch" />
<!--
The following themes are deprecated.
@@ -296,5 +288,8 @@
<style name="Widget.AppCompat.Light.ActionButton" parent="Widget.AppCompat.ActionButton" />
<style name="Widget.AppCompat.Light.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow" />
<style name="Widget.AppCompat.Light.ActionButton.CloseMode" parent="Widget.AppCompat.ActionButton.CloseMode" />
+ <style name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" parent="Widget.AppCompat.Spinner.DropDown.ActionBar" />
+ <style name="Widget.AppCompat.Light.ListView.DropDown" parent="Widget.AppCompat.ListView.DropDown" />
+ <style name="Widget.AppCompat.Light.ListPopupWindow" parent="Widget.AppCompat.ListPopupWindow" />
</resources>
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index 632d773..db2cd73 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -178,9 +178,15 @@
<item name="android:maxHeight">@dimen/abc_action_bar_progress_bar_size</item>
</style>
- <!-- Action Bar Spinner Widgets -->
+ <!-- Spinner Widgets -->
- <style name="Base.Widget.AppCompat.Spinner" parent="">
+ <style name="Base.Widget.AppCompat.Spinner" parent="android:Widget.Spinner">
+ <item name="android:background">@drawable/abc_spinner_mtrl_am_alpha</item>
+ <item name="android:dropDownSelector">?attr/listChoiceBackgroundIndicator</item>
+ <item name="android:dropDownVerticalOffset">0dip</item>
+ </style>
+
+ <style name="Base.Widget.AppCompat.Spinner.DropDown.ActionBar" parent="android:Widget">
<item name="spinnerMode">dropdown</item>
<item name="android:clickable">true</item>
@@ -196,10 +202,6 @@
<item name="disableChildrenWhenDisabled">true</item>
</style>
- <style name="Base.Widget.AppCompat.Light.Spinner" parent="Widget.AppCompat.Spinner">
- <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_light</item>
- </style>
-
<style name="Base.Widget.AppCompat.DropDownItem.Spinner" parent="">
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Widget.DropDownItem</item>
<item name="android:paddingLeft">8dp</item>
@@ -208,12 +210,7 @@
</style>
<style name="Base.Widget.AppCompat.ListView.DropDown" parent="android:Widget.ListView">
- <item name="android:listSelector">@drawable/abc_list_selector_holo_dark</item>
- <item name="android:divider">@null</item>
- </style>
-
- <style name="Base.Widget.AppCompat.Light.ListView.DropDown" parent="android:Widget.ListView">
- <item name="android:listSelector">@drawable/abc_list_selector_holo_light</item>
+ <item name="android:listSelector">?attr/listChoiceBackgroundIndicator</item>
<item name="android:divider">@null</item>
</style>
@@ -233,17 +230,13 @@
</style>
<style name="Base.Widget.AppCompat.ListPopupWindow" parent="">
- <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item>
+ <item name="android:dropDownSelector">?attr/listChoiceBackgroundIndicator</item>
<item name="android:popupBackground">@drawable/abc_popup_background_mtrl_mult</item>
<item name="android:dropDownVerticalOffset">0dip</item>
<item name="android:dropDownHorizontalOffset">0dip</item>
<item name="android:dropDownWidth">wrap_content</item>
</style>
- <style name="Base.Widget.AppCompat.Light.ListPopupWindow" parent="Widget.AppCompat.ListPopupWindow">
- <item name="android:dropDownSelector">@drawable/abc_list_selector_holo_light</item>
- </style>
-
<style name="Base.Widget.AppCompat.PopupMenu.Overflow">
<item name="overlapAnchor">true</item>
<item name="android:dropDownHorizontalOffset">-4dip</item>
@@ -257,7 +250,7 @@
<style name="Base.Widget.AppCompat.PopupMenu" parent="@style/Widget.AppCompat.ListPopupWindow">
</style>
- <style name="Base.Widget.AppCompat.Light.PopupMenu" parent="@style/Widget.AppCompat.Light.ListPopupWindow">
+ <style name="Base.Widget.AppCompat.Light.PopupMenu" parent="@style/Widget.AppCompat.ListPopupWindow">
</style>
<style name="Base.TextAppearance.AppCompat.Widget.PopupMenu.Large" parent="TextAppearance.AppCompat.Menu">
@@ -367,4 +360,14 @@
<item name="spinBars">true</item>
</style>
+ <style name="Base.Widget.AppCompat.CompoundButton.Switch" parent="android:Widget.CompoundButton">
+ <item name="track">@drawable/abc_switch_track_mtrl_alpha</item>
+ <item name="android:thumb">@drawable/abc_switch_thumb_material</item>
+ <item name="switchTextAppearance">@style/TextAppearance.AppCompat.Widget.Switch</item>
+ <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
+ <item name="showText">false</item>
+ </style>
+
+ <style name="Base.TextAppearance.AppCompat.Widget.Switch" parent="TextAppearance.AppCompat.Button" />
+
</resources>
diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml
index d7f7271..3c0ee65 100644
--- a/current/support/v7/appcompat/res/values/themes_base.xml
+++ b/current/support/v7/appcompat/res/values/themes_base.xml
@@ -59,6 +59,12 @@
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.AppCompat.Medium.Inverse</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item>
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item>
+
+ <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item>
+ <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
+
+ <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item>
+ <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
</style>
<style name="Platform.AppCompat.Light" parent="android:Theme.Light">
@@ -99,6 +105,12 @@
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.AppCompat.Medium.Inverse</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item>
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item>
+
+ <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item>
+ <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
+
+ <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item>
+ <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
</style>
<style name="Platform.AppCompat.Dialog" parent="android:Theme.Dialog">
@@ -138,6 +150,12 @@
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.AppCompat.Medium.Inverse</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item>
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item>
+
+ <item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item>
+ <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
+
+ <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item>
+ <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
</style>
<style name="Platform.AppCompat.Light.Dialog" parent="Platform.AppCompat.Dialog" />
@@ -244,15 +262,18 @@
<item name="editTextColor">?android:attr/textColorPrimary</item>
<!-- Color palette -->
- <item name="colorPrimaryDark">@color/material_blue_grey_900</item>
- <item name="colorPrimary">@color/material_blue_grey_800</item>
- <item name="colorAccent">@color/material_deep_teal_200</item>
+ <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
+ <item name="colorPrimary">@color/primary_material_dark</item>
+ <item name="colorAccent">@color/accent_material_dark</item>
<item name="colorControlNormal">?android:attr/textColorSecondary</item>
<item name="colorControlActivated">?attr/colorAccent</item>
<item name="colorControlHighlight">@color/ripple_material_dark</item>
+ <item name="colorSwitchThumbNormal">@color/switch_thumb_normal_material_dark</item>
<item name="drawerArrowStyle">@style/Widget.AppCompat.DrawerArrowToggle</item>
+
+ <item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch</item>
</style>
<!-- Base platform-dependent theme providing an action bar in a light-themed activity. -->
@@ -327,8 +348,8 @@
<item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large</item>
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small</item>
- <item name="listPopupWindowStyle">@style/Widget.AppCompat.Light.ListPopupWindow</item>
- <item name="dropDownListViewStyle">@style/Widget.AppCompat.Light.ListView.DropDown</item>
+ <item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
+ <item name="dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
<!-- SearchView attributes -->
<item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item>
@@ -349,15 +370,18 @@
<item name="editTextColor">?android:attr/textColorPrimary</item>
<!-- Color palette -->
- <item name="colorPrimaryDark">@color/material_blue_grey_100</item>
- <item name="colorPrimary">@color/material_blue_grey_50</item>
- <item name="colorAccent">@color/material_deep_teal_500</item>
+ <item name="colorPrimaryDark">@color/primary_dark_material_light</item>
+ <item name="colorPrimary">@color/primary_material_light</item>
+ <item name="colorAccent">@color/accent_material_light</item>
<item name="colorControlNormal">?android:attr/textColorSecondary</item>
<item name="colorControlActivated">?attr/colorAccent</item>
<item name="colorControlHighlight">@color/ripple_material_light</item>
+ <item name="colorSwitchThumbNormal">@color/switch_thumb_normal_material_light</item>
<item name="drawerArrowStyle">@style/Widget.AppCompat.DrawerArrowToggle</item>
+
+ <item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch</item>
</style>
<style name="Base.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">
@@ -374,8 +398,8 @@
<!-- Panel attributes -->
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
- <item name="colorPrimaryDark">@color/material_blue_grey_900</item>
- <item name="colorPrimary">@color/material_blue_grey_800</item>
+ <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
+ <item name="colorPrimary">@color/primary_material_dark</item>
</style>
<!-- Menu/item attributes -->
@@ -475,13 +499,16 @@
<item name="editTextColor">?android:attr/textColorPrimary</item>
<!-- Color palette -->
- <item name="colorPrimaryDark">@color/material_blue_grey_900</item>
- <item name="colorPrimary">@color/material_blue_grey_800</item>
- <item name="colorAccent">@color/material_deep_teal_200</item>
+ <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
+ <item name="colorPrimary">@color/primary_material_dark</item>
+ <item name="colorAccent">@color/accent_material_dark</item>
<item name="colorControlNormal">?android:attr/textColorSecondary</item>
<item name="colorControlActivated">?attr/colorAccent</item>
<item name="colorControlHighlight">@color/ripple_material_dark</item>
+ <item name="colorSwitchThumbNormal">@color/switch_thumb_normal_material_dark</item>
+
+ <item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch</item>
</style>
<style name="Base.Theme.AppCompat.Dialog" parent="Base.V7.Theme.AppCompat.Dialog" />
@@ -540,6 +567,7 @@
<item name="colorControlNormal">?android:attr/textColorSecondary</item>
<item name="colorControlHighlight">@color/ripple_material_light</item>
+ <item name="colorSwitchThumbNormal">@color/switch_thumb_normal_material_light</item>
<!-- Used by MediaRouter -->
<item name="isLightTheme">true</item>
@@ -575,6 +603,7 @@
<item name="colorControlNormal">?android:attr/textColorSecondary</item>
<item name="colorControlHighlight">@color/ripple_material_dark</item>
+ <item name="colorSwitchThumbNormal">@color/switch_thumb_normal_material_dark</item>
<!-- Used by MediaRouter -->
<item name="isLightTheme">false</item>