diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-05 17:40:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 17:40:01 +0000 |
| commit | 2e6e9b879591068864c4623f414e792707aa2aca (patch) | |
| tree | a1f78c007d2113575f130692c4c41cd94d144676 /src | |
| parent | 5eae46ce1581b40870fbbf71925f6ba82dd9798a (diff) | |
| parent | 40b626b930a1cf51f422fc3c41661fed14fedb84 (diff) | |
| download | android_packages_apps_Trebuchet-2e6e9b879591068864c4623f414e792707aa2aca.tar.gz android_packages_apps_Trebuchet-2e6e9b879591068864c4623f414e792707aa2aca.tar.bz2 android_packages_apps_Trebuchet-2e6e9b879591068864c4623f414e792707aa2aca.zip | |
Merge "Updating assets" into ub-launcher3-burnaby
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/InfoDropTarget.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/UninstallDropTarget.java | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index fa6e74fd1..9c8659c29 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -43,7 +43,7 @@ public class DeleteDropTarget extends ButtonDropTarget { // Get the hover color mHoverColor = getResources().getColor(R.color.delete_target_hover_tint); - setDrawable(R.drawable.ic_launcher_remove_normal); + setDrawable(R.drawable.ic_remove_launcher); } public static boolean supportsDrop(Object info) { diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index f1e9dc83b..8d534d2fe 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -222,8 +222,8 @@ public class FolderIcon extends FrameLayout implements FolderListener { DeviceProfile grid = launcher.getDeviceProfile(); sPreviewSize = grid.folderIconSizePx; sPreviewPadding = res.getDimensionPixelSize(R.dimen.folder_preview_padding); - sSharedOuterRingDrawable = res.getDrawable(R.drawable.portal_ring_outer_holo); - sSharedInnerRingDrawable = res.getDrawable(R.drawable.portal_ring_inner_nolip_holo); + sSharedOuterRingDrawable = res.getDrawable(R.drawable.portal_ring_outer); + sSharedInnerRingDrawable = res.getDrawable(R.drawable.portal_ring_inner_nolip); sSharedFolderLeaveBehind = res.getDrawable(R.drawable.portal_ring_rest); sStaticValuesDirty = false; } diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java index 0f139fa98..0ede2fc11 100644 --- a/src/com/android/launcher3/InfoDropTarget.java +++ b/src/com/android/launcher3/InfoDropTarget.java @@ -41,7 +41,7 @@ public class InfoDropTarget extends ButtonDropTarget { // Get the hover color mHoverColor = getResources().getColor(R.color.info_target_hover_tint); - setDrawable(R.drawable.ic_launcher_info_normal); + setDrawable(R.drawable.ic_info_launcher); } public static void startDetailsActivityForInfo(Object info, Launcher launcher) { diff --git a/src/com/android/launcher3/UninstallDropTarget.java b/src/com/android/launcher3/UninstallDropTarget.java index 419939000..0819f8ce0 100644 --- a/src/com/android/launcher3/UninstallDropTarget.java +++ b/src/com/android/launcher3/UninstallDropTarget.java @@ -28,7 +28,7 @@ public class UninstallDropTarget extends ButtonDropTarget { // Get the hover color mHoverColor = getResources().getColor(R.color.uninstall_target_hover_tint); - setDrawable(R.drawable.ic_launcher_uninstall_normal); + setDrawable(R.drawable.ic_uninstall_launcher); } @Override |