summaryrefslogtreecommitdiffstats
path: root/appcompat
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2015-08-04 09:32:19 -0700
committerRaj Yengisetty <rajesh@cyngn.com>2015-08-04 09:32:19 -0700
commita88269c345c1ab38f101e44884a455c749f641b4 (patch)
treef04ed12a8825280dd095722d5abb99f06bdf9685 /appcompat
parent3f3f929ac88f2b2f52678fa3b54bf4fa0c924d18 (diff)
downloadexternal_android_support-prebuilt-a88269c345c1ab38f101e44884a455c749f641b4.tar.gz
external_android_support-prebuilt-a88269c345c1ab38f101e44884a455c749f641b4.tar.bz2
external_android_support-prebuilt-a88269c345c1ab38f101e44884a455c749f641b4.zip
Change-Id: I06ae7723ae180e2f444183126500b53a1cae8207
Diffstat (limited to 'appcompat')
-rw-r--r--appcompat/android-support-v4.jarbin1184450 -> 1184670 bytes
-rw-r--r--appcompat/android-support-v7-appcompat.jarbin586330 -> 586153 bytes
-rw-r--r--appcompat/res/values-v21/styles_base.xml2
-rw-r--r--appcompat/res/values/styles.xml4
-rw-r--r--appcompat/res/values/themes_base.xml2
5 files changed, 4 insertions, 4 deletions
diff --git a/appcompat/android-support-v4.jar b/appcompat/android-support-v4.jar
index e74b0d7..7b78bb8 100644
--- a/appcompat/android-support-v4.jar
+++ b/appcompat/android-support-v4.jar
Binary files differ
diff --git a/appcompat/android-support-v7-appcompat.jar b/appcompat/android-support-v7-appcompat.jar
index b9dca8a..830a493 100644
--- a/appcompat/android-support-v7-appcompat.jar
+++ b/appcompat/android-support-v7-appcompat.jar
Binary files differ
diff --git a/appcompat/res/values-v21/styles_base.xml b/appcompat/res/values-v21/styles_base.xml
index 1bf90ef..241cb04 100644
--- a/appcompat/res/values-v21/styles_base.xml
+++ b/appcompat/res/values-v21/styles_base.xml
@@ -174,6 +174,8 @@
<style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" />
+ <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText" />
+
<style name="Base.Widget.AppCompat.RatingBar" parent="android:Widget.Material.RatingBar" />
<style name="Base.Widget.AppCompat.Button" parent="android:Widget.Material.Button" />
diff --git a/appcompat/res/values/styles.xml b/appcompat/res/values/styles.xml
index b38c6ad..0ac20d5 100644
--- a/appcompat/res/values/styles.xml
+++ b/appcompat/res/values/styles.xml
@@ -194,9 +194,7 @@
<style name="Widget.AppCompat.SearchView" parent="Base.Widget.AppCompat.SearchView" />
<style name="Widget.AppCompat.SearchView.ActionBar" parent="Base.Widget.AppCompat.SearchView.ActionBar" />
- <style name="Widget.AppCompat.EditText"
- parent="Base.Widget.AppCompat.EditText">
- </style>
+ <style name="Widget.AppCompat.EditText" parent="Base.Widget.AppCompat.EditText"/>
<style name="Widget.AppCompat.CompoundButton.Switch" parent="Base.Widget.AppCompat.CompoundButton.Switch" />
diff --git a/appcompat/res/values/themes_base.xml b/appcompat/res/values/themes_base.xml
index 3e2c841..5db9d05 100644
--- a/appcompat/res/values/themes_base.xml
+++ b/appcompat/res/values/themes_base.xml
@@ -571,7 +571,7 @@
<item name="isLightTheme">true</item>
</style>
- <style name="Base.ThemeOverlay.AppCompat.Dark">
+ <style name="Base.ThemeOverlay.AppCompat.Dark" parent="Platform.ThemeOverlay.AppCompat.Dark">
<item name="android:windowBackground">@color/background_material_dark</item>
<item name="android:colorForeground">@color/bright_foreground_material_dark</item>
<item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item>