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

Commit 91ca519a authored by Jason Monk's avatar Jason Monk
Browse files

Support changes to SuggestionParser 

Change-Id: I002e10cfe2a058f934d2c6218c88c2588654733f
parent 7eda1c5f

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

+11 −6
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.settings.R; 
import com.android.settings.SettingsActivity;

import com.android.settings.dashboard.conditional.Condition;

import com.android.settings.dashboard.conditional.ConditionAdapterUtils;

import com.android.settingslib.SuggestionParser;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.Tile;
@@ -66,6 +67,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
    private int mSuggestionMode = SUGGESTION_MODE_DEFAULT;



    private Condition mExpandedCondition = null;

    private SuggestionParser mSuggestionParser;



    public DashboardAdapter(Context context) {

        mContext = context;
@@ -73,8 +75,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
        setHasStableIds(true);

    }



    public void setSuggestions(List<Tile> suggestions) {

        mSuggestions = suggestions;

    public void setSuggestions(SuggestionParser suggestionParser) {

        mSuggestions = suggestionParser.getSuggestions();

        mSuggestionParser = suggestionParser;

        recountItems();

    }
@@ -235,10 +238,12 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
                new MenuItem.OnMenuItemClickListener() {

            @Override

            public boolean onMenuItemClick(MenuItem item) {

                if (mSuggestionParser.dismissSuggestion(suggestion)) {

                    mContext.getPackageManager().setComponentEnabledSetting(

                            suggestion.intent.getComponent(),

                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                            PackageManager.DONT_KILL_APP);

                }

                mSuggestions.remove(suggestion);

                recountItems();

                return true;

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

+8 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.dashboard;



import android.content.Context;

import android.os.Bundle;

import android.support.v7.widget.LinearLayoutManager;

import android.util.Log;
@@ -55,6 +56,8 @@ public class DashboardSummary extends InstrumentedFragment 
            Settings.StorageSettingsActivity.class.getName(),

    };



    private static final String SUGGESTIONS = "suggestions";



    private FocusRecyclerView mDashboard;

    private DashboardAdapter mAdapter;

    private SummaryLoader mSummaryLoader;
@@ -77,8 +80,10 @@ public class DashboardSummary extends InstrumentedFragment 
        setHasOptionsMenu(true);

        if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)

                + " ms");

        mConditionManager = ConditionManager.get(getContext());

        mSuggestionParser = new SuggestionParser(getContext(), R.xml.suggestion_ordering);

        Context context = getContext();

        mConditionManager = ConditionManager.get(context);

        mSuggestionParser = new SuggestionParser(context,

                context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);

    }



    @Override
@@ -138,7 +143,7 @@ public class DashboardSummary extends InstrumentedFragment 
        mDashboard.setListener(this);

        mAdapter = new DashboardAdapter(getContext());

        mAdapter.setConditions(mConditionManager.getConditions());

        mAdapter.setSuggestions(mSuggestionParser.getSuggestions());

        mAdapter.setSuggestions(mSuggestionParser);

        mSummaryLoader.setAdapter(mAdapter);

        ConditionAdapterUtils.addDismiss(mDashboard);