diff options
| author | Bryan Mawhinney <bryanmawhinney@google.com> | 2014-08-01 10:20:28 +0100 |
|---|---|---|
| committer | Bryan Mawhinney <bryanmawhinney@google.com> | 2014-08-01 10:20:28 +0100 |
| commit | 6b397cc3043b051e1748baabef8f06955362186d (patch) | |
| tree | ad11a4d853f931522ed69f08abaa5781268cc20b /current/support/v7 | |
| parent | 7a5bc6729f80e1c6648f1041453ed8d5c33ee0fa (diff) | |
| download | prebuilts_sdk-6b397cc3043b051e1748baabef8f06955362186d.zip prebuilts_sdk-6b397cc3043b051e1748baabef8f06955362186d.tar.gz prebuilts_sdk-6b397cc3043b051e1748baabef8f06955362186d.tar.bz2 | |
DO NOT MERGE Import prebuilt SDK as of lmp-dev #1322214
Includes the fix for b/16665053
Change-Id: I7fc73cb3ca6b09aa32e4a49108e4dd2830f28037
Diffstat (limited to 'current/support/v7')
| -rw-r--r-- | current/support/v7/appcompat/libs/android-support-v7-appcompat.jar | bin | 459673 -> 459557 bytes | |||
| -rw-r--r-- | current/support/v7/cardview/libs/android-support-v7-cardview.jar | bin | 12378 -> 15031 bytes | |||
| -rw-r--r-- | current/support/v7/cardview/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | current/support/v7/cardview/res/values/dimens.xml | 9 | ||||
| -rw-r--r-- | current/support/v7/cardview/res/values/styles.xml | 3 | ||||
| -rw-r--r-- | current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar | bin | 42049 -> 42049 bytes | |||
| -rw-r--r-- | current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar | bin | 175178 -> 175178 bytes | |||
| -rw-r--r-- | current/support/v7/palette/libs/android-support-v7-palette.jar | bin | 18058 -> 18058 bytes | |||
| -rw-r--r-- | current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar | bin | 159204 -> 159189 bytes |
9 files changed, 12 insertions, 4 deletions
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex aac01ea..a57f865 100644 --- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar +++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar Binary files differindex 4e5fef3..5f31cc2 100644 --- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar +++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar diff --git a/current/support/v7/cardview/res/values/attrs.xml b/current/support/v7/cardview/res/values/attrs.xml index 2a8373f..c370c95 100644 --- a/current/support/v7/cardview/res/values/attrs.xml +++ b/current/support/v7/cardview/res/values/attrs.xml @@ -20,5 +20,9 @@ <attr name="cardBackgroundColor" format="color" /> <!-- Corner radius for CardView. --> <attr name="cardCornerRadius" format="dimension" /> + <!-- Elevation for CardView. --> + <attr name="cardElevation" format="dimension" /> + <!-- Maximum Elevation for CardView. --> + <attr name="cardMaxElevation" format="dimension" /> </declare-styleable> </resources>
\ No newline at end of file diff --git a/current/support/v7/cardview/res/values/dimens.xml b/current/support/v7/cardview/res/values/dimens.xml index 5fbd42a..ebfbb3a 100644 --- a/current/support/v7/cardview/res/values/dimens.xml +++ b/current/support/v7/cardview/res/values/dimens.xml @@ -17,8 +17,9 @@ <resources> <!-- Default radius for CardView corners. --> <dimen name="cardview_default_radius">2dp</dimen> - <!-- Elevation value to use for CardViews on L+. --> - <dimen name="cardview_elevation">2dp</dimen> - <!-- Shadow size for CardView on pre L. --> - <dimen name="cardview_shadow_size">2dp</dimen> + <!-- Elevation value to use for CardViews. Pre-L, it is equal to shadow size. --> + <dimen name="cardview_default_elevation">2dp</dimen> + <!-- Inset shadow for RoundRectDrawableWithShadow. It is used to avoid gaps between the card + and the shadow. --> + <dimen name="cardview_compat_inset_shadow">1dp</dimen> </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 f8a7909..165b7c8 100644 --- a/current/support/v7/cardview/res/values/styles.xml +++ b/current/support/v7/cardview/res/values/styles.xml @@ -16,6 +16,9 @@ <resources> <style name="CardView"> <item name="cardBackgroundColor">@color/cardview_light_background</item> + <item name="cardCornerRadius">@dimen/cardview_default_radius</item> + <item name="cardElevation">@dimen/cardview_default_elevation</item> + <item name="cardMaxElevation">@dimen/cardview_default_elevation</item> </style> <style name="CardView.Light"> <item name="cardBackgroundColor">@color/cardview_light_background</item> diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar Binary files differindex 73456db..e986ae7 100644 --- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar +++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar Binary files differindex e6626b8..670a97e 100644 --- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar +++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar Binary files differindex 2b94c96..f5ba878 100644 --- a/current/support/v7/palette/libs/android-support-v7-palette.jar +++ b/current/support/v7/palette/libs/android-support-v7-palette.jar diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar Binary files differindex a9afd40..5ea0f2e 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar |