diff options
| author | Justin Ho <justinho@google.com> | 2011-03-14 18:24:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 18:24:06 -0700 |
| commit | cc886b93681b75a9b89331930435e0f527b2c3d7 (patch) | |
| tree | 1bd8279befd6dbeaa3e541f1380c0303bb9b3a19 /core/res | |
| parent | 3e3175428c81501d72cda3c026b927ca6408243f (diff) | |
| parent | 4a21cabb9fa7be2ec51f57736233f938c7c46415 (diff) | |
| download | frameworks_base-cc886b93681b75a9b89331930435e0f527b2c3d7.zip frameworks_base-cc886b93681b75a9b89331930435e0f527b2c3d7.tar.gz frameworks_base-cc886b93681b75a9b89331930435e0f527b2c3d7.tar.bz2 | |
Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png | bin | 0 -> 932 bytes | |||
| -rw-r--r-- | core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png | bin | 1051 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png | bin | 0 -> 661 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png | bin | 692 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/layout/text_edit_no_paste_window.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/text_edit_side_no_paste_window.xml | 2 |
6 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png b/core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png Binary files differnew file mode 100644 index 0000000..42ac16b --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_paste_bubble_disabled_holo.png diff --git a/core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png b/core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png Binary files differdeleted file mode 100644 index 15bd8b2..0000000 --- a/core/res/res/drawable-hdpi/ic_paste_bubble_holo_disabled.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png b/core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png Binary files differnew file mode 100644 index 0000000..ce6bd86 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_paste_bubble_disabled_holo.png diff --git a/core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png b/core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png Binary files differdeleted file mode 100644 index e483e84..0000000 --- a/core/res/res/drawable-mdpi/ic_paste_bubble_holo_disabled.png +++ /dev/null diff --git a/core/res/res/layout/text_edit_no_paste_window.xml b/core/res/res/layout/text_edit_no_paste_window.xml index f804986..98b16e2 100644 --- a/core/res/res/layout/text_edit_no_paste_window.xml +++ b/core/res/res/layout/text_edit_no_paste_window.xml @@ -25,7 +25,7 @@ android:paddingRight="16dip" android:paddingTop="8dip" android:paddingBottom="8dip" - android:drawableLeft="@android:drawable/ic_paste_bubble_holo_disabled" + android:drawableLeft="@android:drawable/ic_paste_bubble_disabled_holo" android:drawablePadding="8dip" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMediumInverse" diff --git a/core/res/res/layout/text_edit_side_no_paste_window.xml b/core/res/res/layout/text_edit_side_no_paste_window.xml index 903bcb6..3eb41fb 100644 --- a/core/res/res/layout/text_edit_side_no_paste_window.xml +++ b/core/res/res/layout/text_edit_side_no_paste_window.xml @@ -25,7 +25,7 @@ android:paddingRight="16dip" android:paddingTop="8dip" android:paddingBottom="8dip" - android:drawableLeft="@android:drawable/ic_paste_bubble_holo_disabled" + android:drawableLeft="@android:drawable/ic_paste_bubble_disabled_holo" android:drawablePadding="8dip" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMediumInverse" |
