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

resolve merge conflicts of 6890d53 to master

Browse Source 
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
This commit is contained in:
Andrew Sapperstein
2016-08-24 10:50:28 -04:00
parent 28fcccd185 6890d538ae
commit f36eac3889
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity; import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.Tile;
import java.util.HashSet; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class DashboardSummary extends InstrumentedFragment public class DashboardSummary extends InstrumentedFragment
@@ -73,8 +73,8 @@ public class DashboardSummary extends InstrumentedFragment
private SuggestionParser mSuggestionParser; private SuggestionParser mSuggestionParser;
private LinearLayoutManager mLayoutManager; private LinearLayoutManager mLayoutManager;
private SuggestionsChecks mSuggestionsChecks; private SuggestionsChecks mSuggestionsChecks;
private HashSet<String> mSuggestionsShownLogged; private ArrayList<String> mSuggestionsShownLogged;
private HashSet<String> mSuggestionsHiddenLogged; private ArrayList<String> mSuggestionsHiddenLogged;
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
@@ -95,13 +95,13 @@ public class DashboardSummary extends InstrumentedFragment
context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering); context.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
mSuggestionsChecks = new SuggestionsChecks(getContext()); mSuggestionsChecks = new SuggestionsChecks(getContext());
if (savedInstanceState == null) { if (savedInstanceState == null) {
mSuggestionsShownLogged = new HashSet(); mSuggestionsShownLogged = new ArrayList<>();
mSuggestionsHiddenLogged = new HashSet(); mSuggestionsHiddenLogged = new ArrayList<>();
} else { } else {
mSuggestionsShownLogged = mSuggestionsShownLogged =
(HashSet) savedInstanceState.getSerializable(EXTRA_SUGGESTION_SHOWN_LOGGED); savedInstanceState.getStringArrayList(EXTRA_SUGGESTION_SHOWN_LOGGED);
mSuggestionsHiddenLogged = mSuggestionsHiddenLogged =
(HashSet) savedInstanceState.getSerializable(EXTRA_SUGGESTION_HIDDEN_LOGGED); savedInstanceState.getStringArrayList(EXTRA_SUGGESTION_HIDDEN_LOGGED);
} }
if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime) if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+ " ms"); + " ms");
@@ -182,8 +182,8 @@ public class DashboardSummary extends InstrumentedFragment
if (mAdapter != null) { if (mAdapter != null) {
mAdapter.onSaveInstanceState(outState); mAdapter.onSaveInstanceState(outState);
} }
outState.putSerializable(EXTRA_SUGGESTION_HIDDEN_LOGGED, mSuggestionsHiddenLogged); outState.putStringArrayList(EXTRA_SUGGESTION_HIDDEN_LOGGED, mSuggestionsHiddenLogged);
outState.putSerializable(EXTRA_SUGGESTION_SHOWN_LOGGED, mSuggestionsShownLogged); outState.putStringArrayList(EXTRA_SUGGESTION_SHOWN_LOGGED, mSuggestionsShownLogged);
} }
@Override @Override