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

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

Merge "Make sure the dashboard is up to date"

parents b7df4fa0 8c4ca41d

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

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
        setHasStableIds(true);

    }



    public boolean isShowingAll() {

        return mIsShowingAll;

    }



    public void notifyChanged(DashboardTile tile) {

        for (int i = 0; i < mItems.size(); i++) {

            if (mItems.get(i) == tile) {

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

+7 −0
Original line number Diff line number Diff line
@@ -133,6 +133,13 @@ public class DashboardSummary extends InstrumentedFragment { 
        }



        long start = System.currentTimeMillis();

        // TODO: Cache summaries from old categories somehow.

        List<DashboardCategory> categories =

                ((SettingsActivity) getActivity()).getDashboardCategories(true);

        boolean showingAll = mAdapter != null && mAdapter.isShowingAll();

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

        mSummaryLoader.setAdapter(mAdapter);

        mAdapter.setShowingAll(showingAll);

        mDashboard.setAdapter(mAdapter);



        long delta = System.currentTimeMillis() - start;

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

+7 −2
Original line number Diff line number Diff line
@@ -33,12 +33,13 @@ public class SummaryLoader { 
    private static final boolean DEBUG = DashboardSummary.DEBUG;

    private static final String TAG = "SummaryLoader";



    public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";



    private final Activity mActivity;

    private final DashboardAdapter mAdapter;

    private final ArrayMap<SummaryProvider, DashboardTile> mSummaryMap = new ArrayMap<>();

    private final List<DashboardTile> mTiles = new ArrayList<>();



    public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";

    private DashboardAdapter mAdapter;



    public SummaryLoader(Activity activity, DashboardAdapter adapter,

                  List<DashboardCategory> categories) {
@@ -56,6 +57,10 @@ public class SummaryLoader { 
        }

    }



    public void setAdapter(DashboardAdapter adapter) {

        mAdapter = adapter;

    }



    public void setSummary(SummaryProvider provider, CharSequence summary) {

        DashboardTile tile = mSummaryMap.get(provider);

        tile.summary = summary;