diff --git a/res/drawable-hdpi/ic_launcher_clear_active_holo.png b/res/drawable-hdpi/ic_launcher_clear_active_holo.png deleted file mode 100644 index cdd0052b31..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_clear_active_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_clear_normal_holo.png b/res/drawable-hdpi/ic_launcher_clear_normal_holo.png deleted file mode 100644 index 84549ff946..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_clear_normal_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_info_active.png b/res/drawable-hdpi/ic_launcher_info_active.png new file mode 100644 index 0000000000..f7a3b68fec Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_info_active.png differ diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png deleted file mode 100644 index c534e56702..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_info_active_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_info_normal.png b/res/drawable-hdpi/ic_launcher_info_normal.png new file mode 100644 index 0000000000..780d7962ac Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_info_normal.png differ diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png deleted file mode 100644 index c9bcd7f374..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_info_normal_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_remove_active.png b/res/drawable-hdpi/ic_launcher_remove_active.png new file mode 100644 index 0000000000..e53de0da4a Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_remove_active.png differ diff --git a/res/drawable-hdpi/ic_launcher_remove_normal.png b/res/drawable-hdpi/ic_launcher_remove_normal.png new file mode 100644 index 0000000000..91e19ca349 Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_remove_normal.png differ diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png deleted file mode 100644 index 82b1b59172..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png deleted file mode 100644 index 3fc2e8347b..0000000000 Binary files a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher_uninstall_active.png b/res/drawable-hdpi/ic_launcher_uninstall_active.png new file mode 100644 index 0000000000..22b97ee50c Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_uninstall_active.png differ diff --git a/res/drawable-hdpi/ic_launcher_uninstall_normal.png b/res/drawable-hdpi/ic_launcher_uninstall_normal.png new file mode 100644 index 0000000000..7aea5d06e0 Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_uninstall_normal.png differ diff --git a/res/drawable-mdpi/ic_launcher_clear_active_holo.png b/res/drawable-mdpi/ic_launcher_clear_active_holo.png deleted file mode 100644 index 2683beaa3b..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_clear_active_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_clear_normal_holo.png b/res/drawable-mdpi/ic_launcher_clear_normal_holo.png deleted file mode 100644 index 219f3e5cfd..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_clear_normal_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_info_active.png b/res/drawable-mdpi/ic_launcher_info_active.png new file mode 100644 index 0000000000..ea712722d1 Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_info_active.png differ diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png deleted file mode 100644 index f84b4a6ba6..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_info_active_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_info_normal.png b/res/drawable-mdpi/ic_launcher_info_normal.png new file mode 100644 index 0000000000..8c60159f76 Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_info_normal.png differ diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png deleted file mode 100644 index eac578f5ce..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_info_normal_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_remove_active.png b/res/drawable-mdpi/ic_launcher_remove_active.png new file mode 100644 index 0000000000..f36cfdd2fd Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_remove_active.png differ diff --git a/res/drawable-mdpi/ic_launcher_remove_normal.png b/res/drawable-mdpi/ic_launcher_remove_normal.png new file mode 100644 index 0000000000..60829b9e15 Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_remove_normal.png differ diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png deleted file mode 100644 index 0350e558d9..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png deleted file mode 100644 index 799b62f8bc..0000000000 Binary files a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_uninstall_active.png b/res/drawable-mdpi/ic_launcher_uninstall_active.png new file mode 100644 index 0000000000..e4ee9112d3 Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_uninstall_active.png differ diff --git a/res/drawable-mdpi/ic_launcher_uninstall_normal.png b/res/drawable-mdpi/ic_launcher_uninstall_normal.png new file mode 100644 index 0000000000..aefbc695be Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_uninstall_normal.png differ diff --git a/res/drawable-xhdpi/ic_launcher_clear_active_holo.png b/res/drawable-xhdpi/ic_launcher_clear_active_holo.png deleted file mode 100644 index 1a7e53ddbb..0000000000 Binary files a/res/drawable-xhdpi/ic_launcher_clear_active_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png b/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png deleted file mode 100644 index d4965d9f80..0000000000 Binary files a/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher_info_active.png b/res/drawable-xhdpi/ic_launcher_info_active.png new file mode 100644 index 0000000000..b438f9eb2a Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_info_active.png differ diff --git a/res/drawable-xhdpi/ic_launcher_info_active_holo.png b/res/drawable-xhdpi/ic_launcher_info_active_holo.png deleted file mode 100644 index b8cdbc4f8a..0000000000 Binary files a/res/drawable-xhdpi/ic_launcher_info_active_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher_info_normal.png b/res/drawable-xhdpi/ic_launcher_info_normal.png new file mode 100644 index 0000000000..5c49816fff Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_info_normal.png differ diff --git a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png deleted file mode 100644 index f503fb82d7..0000000000 Binary files a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher_remove_active.png b/res/drawable-xhdpi/ic_launcher_remove_active.png new file mode 100644 index 0000000000..14ac79d414 Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_remove_active.png differ diff --git a/res/drawable-xhdpi/ic_launcher_remove_normal.png b/res/drawable-xhdpi/ic_launcher_remove_normal.png new file mode 100644 index 0000000000..8188805cc1 Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_remove_normal.png differ diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png deleted file mode 100644 index c155274bd3..0000000000 Binary files a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png deleted file mode 100644 index 2ec7ad9b4e..0000000000 Binary files a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher_uninstall_active.png b/res/drawable-xhdpi/ic_launcher_uninstall_active.png new file mode 100644 index 0000000000..2c19b329db Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_uninstall_active.png differ diff --git a/res/drawable-xhdpi/ic_launcher_uninstall_normal.png b/res/drawable-xhdpi/ic_launcher_uninstall_normal.png new file mode 100644 index 0000000000..a093f28c9a Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_uninstall_normal.png differ diff --git a/res/drawable-xxhdpi/ic_launcher_clear_active_holo.png b/res/drawable-xxhdpi/ic_launcher_clear_active_holo.png deleted file mode 100644 index 95cf84115a..0000000000 Binary files a/res/drawable-xxhdpi/ic_launcher_clear_active_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher_clear_normal_holo.png b/res/drawable-xxhdpi/ic_launcher_clear_normal_holo.png deleted file mode 100644 index b0f5a2702a..0000000000 Binary files a/res/drawable-xxhdpi/ic_launcher_clear_normal_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher_info_active.png b/res/drawable-xxhdpi/ic_launcher_info_active.png new file mode 100644 index 0000000000..d354dd33bd Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_info_active.png differ diff --git a/res/drawable-xxhdpi/ic_launcher_info_active_holo.png b/res/drawable-xxhdpi/ic_launcher_info_active_holo.png deleted file mode 100644 index 57f332a94e..0000000000 Binary files a/res/drawable-xxhdpi/ic_launcher_info_active_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher_info_normal.png b/res/drawable-xxhdpi/ic_launcher_info_normal.png new file mode 100644 index 0000000000..c270be286e Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_info_normal.png differ diff --git a/res/drawable-xxhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xxhdpi/ic_launcher_info_normal_holo.png deleted file mode 100644 index 94f0955d64..0000000000 Binary files a/res/drawable-xxhdpi/ic_launcher_info_normal_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher_remove_active.png b/res/drawable-xxhdpi/ic_launcher_remove_active.png new file mode 100644 index 0000000000..9df44042e2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_remove_active.png differ diff --git a/res/drawable-xxhdpi/ic_launcher_remove_normal.png b/res/drawable-xxhdpi/ic_launcher_remove_normal.png new file mode 100644 index 0000000000..5bc8f0c8db Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_remove_normal.png differ diff --git a/res/drawable-xxhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xxhdpi/ic_launcher_trashcan_active_holo.png deleted file mode 100644 index 3bb098c2be..0000000000 Binary files a/res/drawable-xxhdpi/ic_launcher_trashcan_active_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xxhdpi/ic_launcher_trashcan_normal_holo.png deleted file mode 100644 index 550cc5bb82..0000000000 Binary files a/res/drawable-xxhdpi/ic_launcher_trashcan_normal_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher_uninstall_active.png b/res/drawable-xxhdpi/ic_launcher_uninstall_active.png new file mode 100644 index 0000000000..db7d339e68 Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_uninstall_active.png differ diff --git a/res/drawable-xxhdpi/ic_launcher_uninstall_normal.png b/res/drawable-xxhdpi/ic_launcher_uninstall_normal.png new file mode 100644 index 0000000000..4fce55b1e0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_uninstall_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher_info_active.png b/res/drawable-xxxhdpi/ic_launcher_info_active.png new file mode 100644 index 0000000000..162e23dc28 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_info_active.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher_info_normal.png b/res/drawable-xxxhdpi/ic_launcher_info_normal.png new file mode 100644 index 0000000000..270e15d7fb Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_info_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher_remove_active.png b/res/drawable-xxxhdpi/ic_launcher_remove_active.png new file mode 100644 index 0000000000..c0b8ea2eea Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_remove_active.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher_remove_normal.png b/res/drawable-xxxhdpi/ic_launcher_remove_normal.png new file mode 100644 index 0000000000..ed96c55e89 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_remove_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher_uninstall_active.png b/res/drawable-xxxhdpi/ic_launcher_uninstall_active.png new file mode 100644 index 0000000000..75896f3a27 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_uninstall_active.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher_uninstall_normal.png b/res/drawable-xxxhdpi/ic_launcher_uninstall_normal.png new file mode 100644 index 0000000000..61490b9ca6 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_uninstall_normal.png differ diff --git a/res/drawable/info_target_selector.xml b/res/drawable/info_target_selector.xml index f3a7016c38..51caece531 100644 --- a/res/drawable/info_target_selector.xml +++ b/res/drawable/info_target_selector.xml @@ -19,6 +19,6 @@ --> - - + + diff --git a/res/drawable/remove_target_selector.xml b/res/drawable/remove_target_selector.xml index 5e071fbfaf..9025e8a1ad 100644 --- a/res/drawable/remove_target_selector.xml +++ b/res/drawable/remove_target_selector.xml @@ -19,6 +19,6 @@ --> - - + + diff --git a/res/drawable/uninstall_target_selector.xml b/res/drawable/uninstall_target_selector.xml index 229942e3ad..175cc20ddc 100644 --- a/res/drawable/uninstall_target_selector.xml +++ b/res/drawable/uninstall_target_selector.xml @@ -19,6 +19,6 @@ --> - - + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 58a4d4ce13..9695b2606b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,8 +20,9 @@ - #DAFF0000 - #DA0099CC + #DAC1C1C1 + #DAF0592B + #DA009688 #80000000 #20000000 diff --git a/src/com/android/launcher3/UninstallDropTarget.java b/src/com/android/launcher3/UninstallDropTarget.java index 4c52d7e0f7..c3511358d0 100644 --- a/src/com/android/launcher3/UninstallDropTarget.java +++ b/src/com/android/launcher3/UninstallDropTarget.java @@ -26,7 +26,7 @@ public class UninstallDropTarget extends ButtonDropTarget { protected void onFinishInflate() { super.onFinishInflate(); // Get the hover color - mHoverColor = getResources().getColor(R.color.delete_target_hover_tint); + mHoverColor = getResources().getColor(R.color.uninstall_target_hover_tint); setDrawable(R.drawable.uninstall_target_selector); }