Settings Fragment Migration (Build pass app)

This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions

View File

@@ -41,7 +41,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 com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import com.android.settingslib.utils.IconCache;
import java.util.ArrayList;
@@ -63,7 +63,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
private final IconCache mCache;
private final ArrayList<String> mSuggestionsShownLogged;
private final SuggestionFeatureProvider mSuggestionFeatureProvider;
private final SuggestionControllerMixin mSuggestionControllerMixin;
private final SuggestionControllerMixinCompat mSuggestionControllerMixin;
private final Callback mCallback;
private final CardConfig mConfig;
@@ -76,8 +76,9 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
void onSuggestionClosed(Suggestion suggestion);
}
public SuggestionAdapter(Context context, SuggestionControllerMixin suggestionControllerMixin,
Bundle savedInstanceState, Callback callback, Lifecycle lifecycle) {
public SuggestionAdapter(Context context,
SuggestionControllerMixinCompat suggestionControllerMixin, Bundle savedInstanceState,
Callback callback, Lifecycle lifecycle) {
mContext = context;
mSuggestionControllerMixin = suggestionControllerMixin;
mCache = new IconCache(context);