| commit | 0afd07e8490c39a0bed309d7a50b6b806366aa3b | [log] [tgz] |
|---|---|---|
| author | Chris Flatt <cflatt@google.com> | Mon Feb 29 10:00:17 2016 -0800 |
| committer | Chris Flatt <cflatt@google.com> | Mon Feb 29 10:00:17 2016 -0800 |
| tree | d291af0301eb19097d316f107f142e6636c10f16 | |
| parent | 5ea0ed713ab7ee7aeda7d1f60aaf1a794dca452a [diff] |
DO NOT MERGE ANYWHERE. Update support library @ 2643574 from mnc-ub-dev. Change-Id: I7e26477d203602b050781afc86ab4de3a3e95f2c
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar index 7d90409..53a0293 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 82d6dff..c1eb434 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 cca6f63..efc5c8d 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/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar index 66634fe..01c3f21 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 5ee9bc9..db95cc4 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 0c96121..99d04b7 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 8641e5d..cd941d2 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 4485ded..059e9de 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 9a44c6f..d0beb79 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 8a036ec..5f39f5c 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/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar index 27d0ef7..4946b51 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/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar index f8fe333..c812f26 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 6b4db52..feb39e1 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/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar index 7dad608..d91bd19 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/cardview/res/values-v23/styles.xml b/current/support/v7/cardview/res/values-v23/styles.xml new file mode 100644 index 0000000..6961704 --- /dev/null +++ b/current/support/v7/cardview/res/values-v23/styles.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. +--> +<resources> + + <!-- On API v23+ we can use the platform provided floating background color --> + <style name="CardView" parent="Base.CardView"> + <item name="cardBackgroundColor">?android:attr/colorBackgroundFloating</item> + </style> + +</resources> \ No newline at end of file
diff --git a/current/support/v7/cardview/res/values/styles.xml b/current/support/v7/cardview/res/values/styles.xml index 99dfbc9..2ab8a41 100644 --- a/current/support/v7/cardview/res/values/styles.xml +++ b/current/support/v7/cardview/res/values/styles.xml
@@ -14,18 +14,26 @@ limitations under the License. --> <resources> - <style name="CardView"> - <item name="cardBackgroundColor">@color/cardview_light_background</item> + + <style name="Base.CardView" parent="android:Widget"> <item name="cardCornerRadius">@dimen/cardview_default_radius</item> <item name="cardElevation">@dimen/cardview_default_elevation</item> <item name="cardMaxElevation">@dimen/cardview_default_elevation</item> <item name="cardUseCompatPadding">false</item> <item name="cardPreventCornerOverlap">true</item> </style> + + <!-- On older platforms we do not explicitly set a background color and let CardView compute + one based on the theme. --> + <style name="CardView" parent="Base.CardView"> + </style> + <style name="CardView.Light"> <item name="cardBackgroundColor">@color/cardview_light_background</item> </style> + <style name="CardView.Dark"> <item name="cardBackgroundColor">@color/cardview_dark_background</item> </style> + </resources> \ No newline at end of file
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 809bd0d..f35168e 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 d381d77..2dac3b6 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 7c5770c..3b1cc36 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 9cc0ed8..6407b15 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 6ad63fe..4fea6c8 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