Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac15eeb authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am 67130247: Merge "Fix issue where "No recent apps" showed initially before... 

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

* commit '67130247':
  Fix issue where "No recent apps" showed initially before loading thumbnails
parents bb702f57 67130247

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {

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

+9 −0
Original line number Diff line number Diff line
@@ -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);

        }