Skip to content

Commit 0e78df8

Browse files
mikejurkaAndroid (Google) Code Review
authored andcommitted
Merge "Fix recents on crespo"
2 parents fef3d62 + 693ce64 commit 0e78df8

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

packages/SystemUI/src/com/android/systemui/recent/Choreographer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ void startAnimation(boolean appearing) {
134134

135135
void jumpTo(boolean appearing) {
136136
mContentView.setTranslationY(appearing ? 0 : mPanelHeight);
137-
mScrimView.getBackground().setAlpha(appearing ? 255 : 0);
137+
if (mScrimView.getBackground() != null) {
138+
mScrimView.getBackground().setAlpha(appearing ? 255 : 0);
139+
}
138140
}
139141

140142
public void setPanelHeight(int h) {

packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public boolean isInContentArea(int x, int y) {
239239

240240
public void show(boolean show, boolean animate) {
241241
if (show) {
242+
refreshRecentTasksList(null, true);
242243
mWaitingToShow = true;
243244
mWaitingToShowAnimated = animate;
244245
showIfReady();

0 commit comments

Comments
 (0)