diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 39d686f..4351e95 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -308,7 +308,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener // if there are no apps, either bring up a "No recent apps" message, or just // quit early - boolean noApps = (mRecentTaskDescriptions.size() == 0); + boolean noApps = !mFirstScreenful && (mRecentTaskDescriptions.size() == 0); if (mRecentsNoApps != null) { mRecentsNoApps.setVisibility(noApps ? View.VISIBLE : View.INVISIBLE); } else { diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java index 3c71784..f682203 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java @@ -101,6 +101,9 @@ public class RecentsVerticalScrollView extends ScrollView } final View view = mAdapter.getView(i, old, mLinearLayout); + if (view.getParent() != null) { + throw new RuntimeException("Recycled child has parent"); + } if (mPerformanceHelper != null) { mPerformanceHelper.addViewCallback(view); @@ -139,6 +142,9 @@ public class RecentsVerticalScrollView extends ScrollView thumbnailView.setClickable(true); thumbnailView.setOnClickListener(launchAppListener); thumbnailView.setOnLongClickListener(longClickListener); + if (view.getParent() != null) { + throw new RuntimeException("Recycled child has parent"); + } // We don't want to dismiss recents if a user clicks on the app title // (we also don't want to launch the app either, though, because the @@ -148,6 +154,9 @@ public class RecentsVerticalScrollView extends ScrollView appTitle.setOnTouchListener(noOpListener); final View calloutLine = view.findViewById(R.id.recents_callout_line); calloutLine.setOnTouchListener(noOpListener); + if (view.getParent() != null) { + throw new RuntimeException("Recycled child has parent"); + } mLinearLayout.addView(view); } |