summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh Mondegarian <daneshm90@gmail.com>2014-04-22 16:43:25 (GMT)
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-04-22 16:43:25 (GMT)
commit16310323d9c820ae98691fc5f0c459cb18524ca6 (patch)
tree8e571d71c8c5cb30938d40a38b4e1d7a6ac7cbe5
parent87a0eb354ee2afa6f03c30856a7450f1b5c4a0cc (diff)
parent45b71b4584f443454bfd9f1b7b1e07e88fed858f (diff)
downloadandroid_packages_apps_Trebuchet-16310323d9c820ae98691fc5f0c459cb18524ca6.zip
android_packages_apps_Trebuchet-16310323d9c820ae98691fc5f0c459cb18524ca6.tar.gz
android_packages_apps_Trebuchet-16310323d9c820ae98691fc5f0c459cb18524ca6.tar.bz2
Merge "Trebuchet : Don't hideoutlines if in small overview mode" into cm-11.0
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 43994d7..c3ce8bf 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1334,7 +1334,7 @@ public class Workspace extends SmoothPagedView
}
void hideOutlines() {
- if (!mIsSwitchingState) {
+ if (!isSmall() && !mIsSwitchingState) {
if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel();
if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel();
mChildrenOutlineFadeOutAnimation = LauncherAnimUtils.ofFloat(this, "childrenOutlineAlpha", 0.0f);