PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4101ba4eb1

* commit '4101ba4eb1395988941f3f24bc2f502753036e2f':
  Make sure TileAdapter always has a SuggestionParser

Change-Id: Ic204cabd5cdbdd67f6bbdb53032a277da7fd34fa
This commit is contained in:
Jason Monk
2016-05-10 20:29:02 +00:00
committed by android-build-merger
parent a4b264132a 4101ba4eb1
commit 0496ffad87
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/dashboard/DashboardAdapter.java
View File

@@ -80,9 +80,10 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
private Condition mExpandedCondition = null; private Condition mExpandedCondition = null;
private SuggestionParser mSuggestionParser; private SuggestionParser mSuggestionParser;
public DashboardAdapter(Context context) { public DashboardAdapter(Context context, SuggestionParser parser) {
mContext = context; mContext = context;
mCache = new IconCache(context); mCache = new IconCache(context);
mSuggestionParser = parser;
setHasStableIds(true); setHasStableIds(true);
setShowingAll(true); setShowingAll(true);
@@ -92,9 +93,8 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
return mSuggestions; return mSuggestions;
} }
public void setSuggestions(List<Tile> suggestions, SuggestionParser parser) { public void setSuggestions(List<Tile> suggestions) {
mSuggestions = suggestions; mSuggestions = suggestions;
mSuggestionParser = parser;
recountItems(); recountItems();
} }

4
src/com/android/settings/dashboard/DashboardSummary.java
View File

@@ -178,7 +178,7 @@ public class DashboardSummary extends InstrumentedFragment
mDashboard.setHasFixedSize(true); mDashboard.setHasFixedSize(true);
mDashboard.setListener(this); mDashboard.setListener(this);
mDashboard.addItemDecoration(new DashboardDecorator(getContext())); mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
mAdapter = new DashboardAdapter(getContext()); mAdapter = new DashboardAdapter(getContext(), mSuggestionParser);
mAdapter.setConditions(mConditionManager.getConditions()); mAdapter.setConditions(mConditionManager.getConditions());
mDashboard.setAdapter(mAdapter); mDashboard.setAdapter(mAdapter);
mSummaryLoader.setAdapter(mAdapter); mSummaryLoader.setAdapter(mAdapter);
@@ -230,7 +230,7 @@ public class DashboardSummary extends InstrumentedFragment
@Override @Override
protected void onPostExecute(List<Tile> tiles) { protected void onPostExecute(List<Tile> tiles) {
mAdapter.setSuggestions(tiles, mSuggestionParser); mAdapter.setSuggestions(tiles);
} }
} }
} }