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

Commit 1b0d7f14 authored by Zhizhi Liu's avatar Zhizhi Liu Committed by Android (Google) Code Review
Browse files

Merge "Migrate some suggestions related classes SettingsLib(II)"

parents cada64be caeb1720

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

+1 −1
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ import com.android.settings.dashboard.DashboardData.SuggestionConditionHeaderDat 
import com.android.settings.dashboard.conditional.Condition;

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

import com.android.settings.dashboard.suggestions.SuggestionAdapter;

import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;

import com.android.settings.dashboard.suggestions.SuggestionDismissController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.Utils;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.Tile;

import com.android.settingslib.suggestions.SuggestionControllerMixin;



import java.util.ArrayList;

import java.util.List;

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.settings.dashboard.DashboardDataV2.ConditionHeaderData; 
import com.android.settings.dashboard.conditional.Condition;

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

import com.android.settings.dashboard.suggestions.SuggestionAdapterV2;

import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -50,6 +49,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; 
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.Tile;

import com.android.settingslib.suggestions.SuggestionControllerMixin;



import java.util.List;

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

+4 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.settings.dashboard.conditional.ConditionManager; 
import com.android.settings.dashboard.conditional.ConditionManager.ConditionListener;

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

import com.android.settings.dashboard.conditional.FocusRecyclerView.FocusListener;

import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;

import com.android.settings.dashboard.suggestions.SuggestionDismissController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.ActionBarShadowController;
@@ -46,6 +45,7 @@ import com.android.settingslib.drawer.CategoryKey; 
import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.SettingsDrawerActivity;

import com.android.settingslib.drawer.SettingsDrawerActivity.CategoryListener;

import com.android.settingslib.suggestions.SuggestionControllerMixin;

import com.android.settingslib.utils.ThreadUtils;



import java.util.List;
@@ -87,7 +87,9 @@ public class DashboardSummary extends InstrumentedFragment 
        super.onAttach(context);

        Log.d(TAG, "Creating SuggestionControllerMixin");

        mSuggestionControllerMixin = new SuggestionControllerMixin(context, this /* host */,

                getLifecycle());

                getLifecycle(), FeatureFactory.getFactory(context)

                                    .getSuggestionFeatureProvider(context)

                                    .getSuggestionServiceComponent());

    }



    @Override

src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; 
import com.android.settings.dashboard.DashboardAdapter.IconCache;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.suggestions.SuggestionControllerMixin;



import java.util.List;

import java.util.Objects;

src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; 
import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;

import com.android.settingslib.suggestions.SuggestionControllerMixin;



import java.util.ArrayList;

import java.util.List;