diff options
| author | nebkat <nebkat@teamhacksung.org> | 2013-01-06 08:25:45 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-06 08:25:45 -0800 |
| commit | 3642fc08b3e2eaaa0e34faec34bb6529b70a3501 (patch) | |
| tree | 821dd1c68c8604262637943eb998f7ee589967c5 | |
| parent | 57fc0ef802847dc323fc05b8e1f42f48b72d9a73 (diff) | |
| parent | fa0abb7a07b2fb9e9c6a863402c42e0710311040 (diff) | |
| download | android_packages_apps_Trebuchet-3642fc08b3e2eaaa0e34faec34bb6529b70a3501.tar.gz android_packages_apps_Trebuchet-3642fc08b3e2eaaa0e34faec34bb6529b70a3501.tar.bz2 android_packages_apps_Trebuchet-3642fc08b3e2eaaa0e34faec34bb6529b70a3501.zip | |
Merge "Workspace: Only show hotseat outlines if hovering over" into cm-10.1
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index ac327f879..b78b44899 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -478,7 +478,6 @@ public class Workspace extends PagedView updateChildrenLayersEnabled(false); mLauncher.lockScreenOrientation(); setChildrenBackgroundAlphaMultipliers(1f); - mLauncher.getHotseat().setChildrenOutlineAlpha(1f); // Prevent any Un/InstallShortcutReceivers from updating the db while we are dragging InstallShortcutReceiver.enableInstallQueue(); UninstallShortcutReceiver.enableUninstallQueue(); @@ -3384,6 +3383,8 @@ public class Workspace extends PagedView } } + mLauncher.getHotseat().setChildrenOutlineAlpha(mLauncher.isHotseatLayout(layout) ? 1f : 0f); + // Handle the drag over if (mDragTargetLayout != null) { // We want the point to be mapped to the dragTarget. |