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

Merge "Fix issue where "No recent apps" showed initially before loading thumbnails" into jb-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-05-30 13:39:39 -07:00
committed by Android (Google) Code Review
parent c5d2050961 d234b32e99
commit 6713024727
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
View File

@@ -309,7 +309,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 {

9
packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
View File

@@ -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);
}