Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38

Browse Source 
automerge: 7988ef9

* commit '7988ef9c4da50f007fde71a121f89e6b9796c69e':
  Fixed a bug where the empty shade and dismiss views would animate
This commit is contained in:
Selim Cinek
2014-12-11 18:04:17 +00:00
committed by android-build-merger
parent 7a5409fe63 7988ef9c4d
commit 58fc8db68e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -2280,8 +2280,7 @@ public class NotificationStackScrollLayout extends ViewGroup
updateContentHeight(); updateContentHeight();
notifyHeightChangeListener(mDismissView); notifyHeightChangeListener(mDismissView);
} else { } else {
mEmptyShadeView.setWillBeGone(true); Runnable onFinishedRunnable = new Runnable() {
mEmptyShadeView.performVisibilityAnimation(false, new Runnable() {
@Override @Override
public void run() { public void run() {
mEmptyShadeView.setVisibility(GONE); mEmptyShadeView.setVisibility(GONE);
@@ -2289,7 +2288,14 @@ public class NotificationStackScrollLayout extends ViewGroup
updateContentHeight(); updateContentHeight();
notifyHeightChangeListener(mDismissView); notifyHeightChangeListener(mDismissView);
} }
}); };
if (mAnimationsEnabled) {
mEmptyShadeView.setWillBeGone(true);
mEmptyShadeView.performVisibilityAnimation(false, onFinishedRunnable);
} else {
mEmptyShadeView.setInvisible();
onFinishedRunnable.run();
}
} }
} }
} }
@@ -2318,7 +2324,7 @@ public class NotificationStackScrollLayout extends ViewGroup
notifyHeightChangeListener(mDismissView); notifyHeightChangeListener(mDismissView);
} }
}; };
if (mDismissView.isButtonVisible() && mIsExpanded) { if (mDismissView.isButtonVisible() && mIsExpanded && mAnimationsEnabled) {
mDismissView.setWillBeGone(true); mDismissView.setWillBeGone(true);
mDismissView.performVisibilityAnimation(false, dimissHideFinishRunnable); mDismissView.performVisibilityAnimation(false, dimissHideFinishRunnable);
} else { } else {