diff options
| author | Alan Viverette <alanv@google.com> | 2014-07-21 21:55:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-19 22:40:06 +0000 |
| commit | c2ae1a6b455d97c4e89e2bf7b113435dd63bb36f (patch) | |
| tree | bad0ac59f55f9311bb3041f9ee8fb91856b4bbaf | |
| parent | 340c98cae8131bddee98b40108a90ebc2db46838 (diff) | |
| parent | c6696c11d74656fa9e5411271519612e2fd4f0df (diff) | |
| download | frameworks_base-c2ae1a6b455d97c4e89e2bf7b113435dd63bb36f.zip frameworks_base-c2ae1a6b455d97c4e89e2bf7b113435dd63bb36f.tar.gz frameworks_base-c2ae1a6b455d97c4e89e2bf7b113435dd63bb36f.tar.bz2 | |
Merge "Move insets out of edit text background" into lmp-dev
| -rw-r--r-- | core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png | bin | 190 -> 94 bytes | |||
| -rw-r--r-- | core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png | bin | 194 -> 99 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png | bin | 160 -> 88 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png | bin | 158 -> 95 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png | bin | 244 -> 100 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png | bin | 243 -> 103 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png | bin | 1362 -> 112 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png | bin | 1366 -> 117 bytes | |||
| -rw-r--r-- | core/res/res/drawable/edit_text_material.xml | 39 |
9 files changed, 22 insertions, 17 deletions
diff --git a/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex 7c77a45..b9a81be 100644 --- a/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png Binary files differindex bc6da21..3682629 100644 --- a/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex 7a72295..f3d06fe 100644 --- a/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png Binary files differindex 483931f..f0e7db8 100644 --- a/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex 16c376a..7174b67 100644 --- a/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png Binary files differindex e3bd904..46dad22 100644 --- a/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex a22f352..661d5f0 100644 --- a/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png Binary files differindex b0504e0..d7696c3 100644 --- a/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable/edit_text_material.xml b/core/res/res/drawable/edit_text_material.xml index 86cec8f..eaf5e45 100644 --- a/core/res/res/drawable/edit_text_material.xml +++ b/core/res/res/drawable/edit_text_material.xml @@ -14,20 +14,25 @@ limitations under the License. --> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?attr/colorControlActivated"> - <item> - <selector> - <item android:state_enabled="false"> - <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" - android:tint="?attr/colorControlNormal" - android:alpha="?attr/disabledAlpha" /> - </item> - <item> - <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" - android:tint="?attr/colorControlNormal" /> - </item> - </selector> - </item> - <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" /> -</ripple> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:insetLeft="@dimen/control_inset_material" + android:insetTop="@dimen/control_inset_material" + android:insetBottom="@dimen/control_inset_material" + android:insetRight="@dimen/control_inset_material"> + <ripple android:color="?attr/colorControlActivated"> + <item> + <selector> + <item android:state_enabled="false"> + <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" + android:tint="?attr/colorControlNormal" + android:alpha="?attr/disabledAlpha" /> + </item> + <item> + <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" + android:tint="?attr/colorControlNormal" /> + </item> + </selector> + </item> + <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" /> + </ripple> +</inset> |
