summaryrefslogtreecommitdiffstats
path: root/current/support/design
diff options
context:
space:
mode:
Diffstat (limited to 'current/support/design')
-rw-r--r--current/support/design/libs/android-support-design.jarbin89748 -> 108395 bytes
-rw-r--r--current/support/design/res/values/attrs.xml11
-rw-r--r--current/support/design/res/values/colors.xml2
-rw-r--r--current/support/design/res/values/styles.xml13
4 files changed, 26 insertions, 0 deletions
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index 21bdaa1..6e69c67 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/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index 7a5582e..62fb2cd 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -141,5 +141,16 @@
<flag name="end" value="0x00800005" />
</attr>
</declare-styleable>
+
+ <declare-styleable name="TextInputLayout">
+ <attr name="hintTextAppearance" format="reference" />
+ <!-- The hint to display in the floating label -->
+ <attr name="android:hint" />
+ <!-- Whether the layout is laid out as if an error will be displayed -->
+ <attr name="errorEnabled" format="boolean" />
+ <!-- TextAppearance of any error message displayed -->
+ <attr name="errorTextAppearance" format="reference" />
+ </declare-styleable>
+
</resources>
diff --git a/current/support/design/res/values/colors.xml b/current/support/design/res/values/colors.xml
index fdd5127..c005c91 100644
--- a/current/support/design/res/values/colors.xml
+++ b/current/support/design/res/values/colors.xml
@@ -24,4 +24,6 @@
<!-- Shadow color for the furthest pixels of a shadow -->
<color name="shadow_end_color">@android:color/transparent</color>
+ <color name="error_color">#FFDD2C00</color>
+
</resources> \ No newline at end of file
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index f00293b..e3ca35d 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -59,5 +59,18 @@
<item name="textAllCaps">true</item>
</style>
+ <style name="Widget.Design.TextInputLayout" parent="android:Widget">
+ <item name="hintTextAppearance">@style/TextAppearance.Design.Hint</item>
+ <item name="errorTextAppearance">@style/TextAppearance.Design.Error</item>
+ </style>
+
+ <style name="TextAppearance.Design.Hint" parent="TextAppearance.AppCompat.Caption">
+ <item name="android:textColor">?attr/colorControlActivated</item>
+ </style>
+
+ <style name="TextAppearance.Design.Error" parent="TextAppearance.AppCompat.Caption">
+ <item name="android:textColor">@color/error_color</item>
+ </style>
+
</resources>