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

resolve merge conflicts of 0496ffa to master

Browse Source 
Change-Id: I61589b7e9f1190e19d48dbb421541ebc2891ee82
This commit is contained in:
Jason Monk
2016-05-10 16:34:48 -04:00
parent fec0c1b1c7 0496ffad87
commit 2e2f19d2eb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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