diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-07 21:06:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 21:06:32 +0000 |
| commit | 0cb418588aee5072bb29bc158e4446130dd74921 (patch) | |
| tree | 02558b248f77347e9a4e85a357f454e666ea2d5b | |
| parent | 98ae4dfbbc2bf5d61786674dd75127eb4ca238e9 (diff) | |
| parent | 9feb4e0d9155c09560f0cf3ec5d5b95c03672739 (diff) | |
| download | frameworks_base-0cb418588aee5072bb29bc158e4446130dd74921.zip frameworks_base-0cb418588aee5072bb29bc158e4446130dd74921.tar.gz frameworks_base-0cb418588aee5072bb29bc158e4446130dd74921.tar.bz2 | |
Merge "Replace Material text cursor with XML shape" into mnc-dev
| -rw-r--r-- | core/res/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png | bin | 108 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/text_cursor_mtrl_alpha.9.png | bin | 106 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xhdpi/text_cursor_mtrl_alpha.9.png | bin | 105 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xxhdpi/text_cursor_mtrl_alpha.9.png | bin | 134 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable/text_cursor_material.xml | 15 |
5 files changed, 12 insertions, 3 deletions
diff --git a/core/res/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png Binary files differdeleted file mode 100644 index 0179433..0000000 --- a/core/res/res/drawable-hdpi/text_cursor_mtrl_alpha.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/text_cursor_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/text_cursor_mtrl_alpha.9.png Binary files differdeleted file mode 100644 index e5760be..0000000 --- a/core/res/res/drawable-mdpi/text_cursor_mtrl_alpha.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/text_cursor_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/text_cursor_mtrl_alpha.9.png Binary files differdeleted file mode 100644 index 3939214..0000000 --- a/core/res/res/drawable-xhdpi/text_cursor_mtrl_alpha.9.png +++ /dev/null diff --git a/core/res/res/drawable-xxhdpi/text_cursor_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/text_cursor_mtrl_alpha.9.png Binary files differdeleted file mode 100644 index 432c385..0000000 --- a/core/res/res/drawable-xxhdpi/text_cursor_mtrl_alpha.9.png +++ /dev/null diff --git a/core/res/res/drawable/text_cursor_material.xml b/core/res/res/drawable/text_cursor_material.xml index a350c47..0bedaa9 100644 --- a/core/res/res/drawable/text_cursor_material.xml +++ b/core/res/res/drawable/text_cursor_material.xml @@ -14,6 +14,15 @@ limitations under the License. --> -<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/text_cursor_mtrl_alpha" - android:tint="?attr/colorControlActivated" /> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:inset="2dp"> + <shape + android:tint="?attr/colorControlActivated" + android:shape="rectangle"> + <size + android:height="2dp" + android:width="2dp" /> + <solid + android:color="@color/white" /> + </shape> +</inset> |
