Merge "Fix 3493373: back button displays blue homescreen borders"

This commit is contained in:
Patrick Dubroy
2011-03-01 10:28:22 -08:00
committed by Android (Google) Code Review
2 changed files with 20 additions and 6 deletions
+8 -2
View File
@@ -896,7 +896,7 @@ public class Workspace extends SmoothPagedView
}
}
public void showOutlines() {
void showOutlines() {
if (!mIsSmall && !mIsInUnshrinkAnimation) {
if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel();
if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel();
@@ -906,7 +906,7 @@ public class Workspace extends SmoothPagedView
}
}
public void hideOutlines() {
void hideOutlines() {
if (!mIsSmall && !mIsInUnshrinkAnimation) {
if (mChildrenOutlineFadeInAnimation != null) mChildrenOutlineFadeInAnimation.cancel();
if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel();
@@ -917,6 +917,12 @@ public class Workspace extends SmoothPagedView
}
}
public void showOutlinesTemporarily() {
if (!mIsPageMoving && !isTouchActive()) {
snapToPage(mCurrentPage);
}
}
public void setChildrenOutlineAlpha(float alpha) {
mChildrenOutlineAlpha = alpha;
for (int i = 0; i < getChildCount(); i++) {