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

Merge "Adding the dismiss logic for setting smart suggestions."

Browse Source
This commit is contained in:
Soroosh Mariooryad
2017-02-07 02:12:55 +00:00
committed by Android (Google) Code Review
parent 2d7d53edd6 81adc530d9
commit 634b4eb315
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
if (mSuggestionParser == null) { if (mSuggestionParser == null) {
return; return;
} }
if (mSuggestionParser.dismissSuggestion(suggestion)) { boolean isSmartSuggestionEnabled = FeatureFactory.getFactory(mContext)
.getSuggestionFeatureProvider().isSmartSuggestionEnabled(mContext);
if (mSuggestionParser.dismissSuggestion(suggestion, isSmartSuggestionEnabled)) {
mContext.getPackageManager().setComponentEnabledSetting( mContext.getPackageManager().setComponentEnabledSetting(
suggestion.intent.getComponent(), suggestion.intent.getComponent(),
PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

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

@@ -268,8 +268,10 @@ public class DashboardSummary extends InstrumentedFragment
@Override @Override
protected List<Tile> doInBackground(Void... params) { protected List<Tile> doInBackground(Void... params) {
final Context context = getContext(); final Context context = getContext();
List<Tile> suggestions = mSuggestionParser.getSuggestions(); boolean isSmartSuggestionEnabled =
if (mSuggestionFeatureProvider.isSmartSuggestionEnabled(context)) { mSuggestionFeatureProvider.isSmartSuggestionEnabled(context);
List<Tile> suggestions = mSuggestionParser.getSuggestions(isSmartSuggestionEnabled);
if (isSmartSuggestionEnabled) {
List<String> suggestionIds = new ArrayList<>(suggestions.size()); List<String> suggestionIds = new ArrayList<>(suggestions.size());
for (Tile suggestion : suggestions) { for (Tile suggestion : suggestions) {
suggestionIds.add( suggestionIds.add(