summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2014-09-19 17:53:18 -0700
committerQiwen Zhao <zhao@google.com>2014-09-19 17:53:18 -0700
commit690a6c0f6d4f604b8753351671f73d045f7b6307 (patch)
tree9b5b1970a15754d7572c189d6d6d7d347fdecfeb
parent8072f3d9e304e65387ecd146aa6319c39f10107a (diff)
downloadandroid-21-690a6c0f6d4f604b8753351671f73d045f7b6307.tar.gz
Import prebuilt android support libs build 1452643
http://android-build/builds/git_lmp-sdk-release-linux-sdk_x86-sdk/1452643/sdk-repo-linux-support-1452643.zip
-rw-r--r--support/appcompat/libs/android-support-v4.jarbin970255 -> 970623 bytes
-rw-r--r--support/appcompat/libs/android-support-v7-appcompat.jarbin494163 -> 498932 bytes
-rw-r--r--support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.pngbin875 -> 0 bytes
-rw-r--r--support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png (renamed from support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_light.9.png)bin850 -> 850 bytes
-rw-r--r--support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.pngbin567 -> 0 bytes
-rw-r--r--support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png (renamed from support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_light.9.png)bin562 -> 562 bytes
-rw-r--r--support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.pngbin1220 -> 0 bytes
-rw-r--r--support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.pngbin1178 -> 0 bytes
-rw-r--r--support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.pngbin0 -> 1507 bytes
-rw-r--r--support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.pngbin2064 -> 0 bytes
-rw-r--r--support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png (renamed from support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_light.9.png)bin2007 -> 2007 bytes
-rw-r--r--support/appcompat/res/layout/abc_expanded_menu_layout.xml3
-rw-r--r--support/appcompat/res/values-v11/themes_base.xml3
-rw-r--r--support/appcompat/res/values-v21/styles_base.xml2
-rw-r--r--support/appcompat/res/values/attrs.xml9
-rw-r--r--support/appcompat/res/values/themes_base.xml10
-rw-r--r--support/cardview/libs/android-support-v7-cardview.jarbin17125 -> 17125 bytes
-rw-r--r--support/gridlayout/libs/android-support-v7-gridlayout.jarbin42438 -> 42438 bytes
-rw-r--r--support/leanback/libs/android-support-v17-leanback.jarbin415283 -> 416537 bytes
-rw-r--r--support/mediarouter/libs/android-support-v7-mediarouter.jarbin178047 -> 178047 bytes
-rw-r--r--support/multidex/libs/android-support-multidex.jarbin20596 -> 20596 bytes
-rw-r--r--support/recyclerview/libs/android-support-v7-recyclerview.jarbin192893 -> 192893 bytes
-rw-r--r--support/v13/android-support-v13.jarbin987555 -> 987923 bytes
-rw-r--r--support/v4/android-support-v4.jarbin970255 -> 970623 bytes
24 files changed, 17 insertions, 10 deletions
diff --git a/support/appcompat/libs/android-support-v4.jar b/support/appcompat/libs/android-support-v4.jar
index 9e22cc92..2e2dd3df 100644
--- a/support/appcompat/libs/android-support-v4.jar
+++ b/support/appcompat/libs/android-support-v4.jar
Binary files differ
diff --git a/support/appcompat/libs/android-support-v7-appcompat.jar b/support/appcompat/libs/android-support-v7-appcompat.jar
index 3d72acac..3013404e 100644
--- a/support/appcompat/libs/android-support-v7-appcompat.jar
+++ b/support/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png
deleted file mode 100644
index 465ee6d0..00000000
--- a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
index 76a5c53d..76a5c53d 100644
--- a/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_holo_light.9.png
+++ b/support/appcompat/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
Binary files differ
diff --git a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png
deleted file mode 100644
index 36779947..00000000
--- a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
index 02b25f09..02b25f09 100644
--- a/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_holo_light.9.png
+++ b/support/appcompat/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
Binary files differ
diff --git a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png
deleted file mode 100644
index c1ad023a..00000000
--- a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png
deleted file mode 100644
index a1e33d67..00000000
--- a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
new file mode 100644
index 00000000..4fda8677
--- /dev/null
+++ b/support/appcompat/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
Binary files differ
diff --git a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.png b/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.png
deleted file mode 100644
index 31a4caad..00000000
--- a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_light.9.png b/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
index f5c18d08..f5c18d08 100644
--- a/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_holo_light.9.png
+++ b/support/appcompat/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
Binary files differ
diff --git a/support/appcompat/res/layout/abc_expanded_menu_layout.xml b/support/appcompat/res/layout/abc_expanded_menu_layout.xml
index f4af8823..20e8b19b 100644
--- a/support/appcompat/res/layout/abc_expanded_menu_layout.xml
+++ b/support/appcompat/res/layout/abc_expanded_menu_layout.xml
@@ -18,4 +18,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/expanded_menu"
android:layout_width="?attr/panelMenuListWidth"
- android:layout_height="wrap_content"/>
+ android:layout_height="wrap_content"
+ android:background="?attr/panelBackground"/>
diff --git a/support/appcompat/res/values-v11/themes_base.xml b/support/appcompat/res/values-v11/themes_base.xml
index a8317e2d..54cd6ce8 100644
--- a/support/appcompat/res/values-v11/themes_base.xml
+++ b/support/appcompat/res/values-v11/themes_base.xml
@@ -252,7 +252,8 @@
<!-- Panel attributes -->
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
- <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_light</item>
+ <item name="android:panelBackground">@android:color/transparent</item>
+ <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item>
<!-- List attributes -->
diff --git a/support/appcompat/res/values-v21/styles_base.xml b/support/appcompat/res/values-v21/styles_base.xml
index 3a9837c7..0ec6566c 100644
--- a/support/appcompat/res/values-v21/styles_base.xml
+++ b/support/appcompat/res/values-v21/styles_base.xml
@@ -126,7 +126,7 @@
</style>
<style name="Base.Widget.AppCompat.ListView.Menu"
- parent="android:Widget.ListView.Menu" />
+ parent="android:Widget.Material.ListView" />
<!-- Popup Menu -->
diff --git a/support/appcompat/res/values/attrs.xml b/support/appcompat/res/values/attrs.xml
index 9bf6e09f..bcdb152a 100644
--- a/support/appcompat/res/values/attrs.xml
+++ b/support/appcompat/res/values/attrs.xml
@@ -260,12 +260,12 @@
<!-- ============ -->
<eat-comment />
+ <!-- The background of a panel when it is inset from the left and right edges of the screen. -->
+ <attr name="panelBackground" format="reference" />
<!-- Default Panel Menu width. -->
<attr name="panelMenuListWidth" format="dimension" />
-
<!-- Default Panel Menu style. -->
<attr name="panelMenuListTheme" format="reference" />
-
<!-- Drawable used as a background for selected list items. -->
<attr name="listChoiceBackgroundIndicator" format="reference" />
@@ -443,7 +443,7 @@
<!-- Default disabled icon alpha for each menu item that shows an icon. -->
<attr name="android:itemIconDisabledAlpha"/>
<!-- Whether space should be reserved in layout when an icon is missing. -->
- <attr name="android:preserveIconSpacing"/>
+ <attr name="preserveIconSpacing" format="boolean" />
</declare-styleable>
<declare-styleable name="ActionMenuView">
<!-- Size of padding on either end of a divider. -->
@@ -734,6 +734,9 @@
<!-- Text to set as the content description for the navigation button
located at the start of the toolbar. -->
<attr name="navigationContentDescription" format="string" />
+
+ <!-- Allows us to read in the minHeight attr pre-v16 -->
+ <attr name="android:minHeight" />
</declare-styleable>
<declare-styleable name="PopupWindowBackgroundState">
diff --git a/support/appcompat/res/values/themes_base.xml b/support/appcompat/res/values/themes_base.xml
index 7c14d0c3..d7f72710 100644
--- a/support/appcompat/res/values/themes_base.xml
+++ b/support/appcompat/res/values/themes_base.xml
@@ -201,7 +201,8 @@
<!-- Panel attributes -->
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
- <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item>
+ <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
+ <item name="android:panelBackground">@android:color/transparent</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
<!-- List attributes -->
@@ -305,7 +306,8 @@
<!-- Panel attributes -->
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
- <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_light</item>
+ <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
+ <item name="android:panelBackground">@android:color/transparent</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item>
<!-- List attributes -->
@@ -370,7 +372,6 @@
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<!-- Panel attributes -->
- <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
<item name="colorPrimaryDark">@color/material_blue_grey_900</item>
@@ -431,7 +432,8 @@
<!-- Panel attributes -->
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
- <item name="android:panelBackground">@drawable/abc_menu_hardkey_panel_holo_dark</item>
+ <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
+ <item name="android:panelBackground">@android:color/transparent</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
<!-- List attributes -->
diff --git a/support/cardview/libs/android-support-v7-cardview.jar b/support/cardview/libs/android-support-v7-cardview.jar
index 9dde70bc..ff0769b7 100644
--- a/support/cardview/libs/android-support-v7-cardview.jar
+++ b/support/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/support/gridlayout/libs/android-support-v7-gridlayout.jar b/support/gridlayout/libs/android-support-v7-gridlayout.jar
index 8db8ff11..e0308729 100644
--- a/support/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/support/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/support/leanback/libs/android-support-v17-leanback.jar b/support/leanback/libs/android-support-v17-leanback.jar
index 7ca90f47..fb590c12 100644
--- a/support/leanback/libs/android-support-v17-leanback.jar
+++ b/support/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/support/mediarouter/libs/android-support-v7-mediarouter.jar b/support/mediarouter/libs/android-support-v7-mediarouter.jar
index 258b5ba7..3cd04918 100644
--- a/support/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/support/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/support/multidex/libs/android-support-multidex.jar b/support/multidex/libs/android-support-multidex.jar
index 59640041..7281ad3e 100644
--- a/support/multidex/libs/android-support-multidex.jar
+++ b/support/multidex/libs/android-support-multidex.jar
Binary files differ
diff --git a/support/recyclerview/libs/android-support-v7-recyclerview.jar b/support/recyclerview/libs/android-support-v7-recyclerview.jar
index b341a662..a3b1cecf 100644
--- a/support/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/support/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
diff --git a/support/v13/android-support-v13.jar b/support/v13/android-support-v13.jar
index 4821ee39..f20d2389 100644
--- a/support/v13/android-support-v13.jar
+++ b/support/v13/android-support-v13.jar
Binary files differ
diff --git a/support/v4/android-support-v4.jar b/support/v4/android-support-v4.jar
index 9e22cc92..2e2dd3df 100644
--- a/support/v4/android-support-v4.jar
+++ b/support/v4/android-support-v4.jar
Binary files differ