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

Commit a50a14a2 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev

parents a3b2bdc1 a41a8d05

src/com/android/settings/dashboard/DashboardAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -80,9 +80,10 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
    private Condition mExpandedCondition = null;

    private SuggestionParser mSuggestionParser;



    public DashboardAdapter(Context context) {

    public DashboardAdapter(Context context, SuggestionParser parser) {

        mContext = context;

        mCache = new IconCache(context);

        mSuggestionParser = parser;



        setHasStableIds(true);

        setShowingAll(true);
@@ -92,9 +93,8 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
        return mSuggestions;

    }



    public void setSuggestions(List<Tile> suggestions, SuggestionParser parser) {

    public void setSuggestions(List<Tile> suggestions) {

        mSuggestions = suggestions;

        mSuggestionParser = parser;

        recountItems();

    }

src/com/android/settings/dashboard/DashboardSummary.java

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class DashboardSummary extends InstrumentedFragment 
        mDashboard.setHasFixedSize(true);

        mDashboard.setListener(this);

        mDashboard.addItemDecoration(new DashboardDecorator(getContext()));

        mAdapter = new DashboardAdapter(getContext());

        mAdapter = new DashboardAdapter(getContext(), mSuggestionParser);

        mAdapter.setConditions(mConditionManager.getConditions());

        mDashboard.setAdapter(mAdapter);

        mSummaryLoader.setAdapter(mAdapter);
@@ -240,7 +240,7 @@ public class DashboardSummary extends InstrumentedFragment 


        @Override

        protected void onPostExecute(List<Tile> tiles) {

            mAdapter.setSuggestions(tiles, mSuggestionParser);

            mAdapter.setSuggestions(tiles);

        }

    }

}