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

Merge "Fix panel slices title not updated when locale changed" into qt-dev

Browse Source
This commit is contained in:
Linda Tseng
2019-04-09 16:57:26 +00:00
committed by Android (Google) Code Review
parent 8bf3ab9d5c 083243df76
commit 3ec5e76c86
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/slices/SliceDataConverter.java
View File

@@ -78,11 +78,8 @@ class SliceDataConverter {
private Context mContext; private Context mContext;
private List<SliceData> mSliceData;
public SliceDataConverter(Context context) { public SliceDataConverter(Context context) {
mContext = context; mContext = context;
mSliceData = new ArrayList<>();
} }
/** /**
@@ -96,9 +93,7 @@ class SliceDataConverter {
* {@link com.android.settings.core.BasePreferenceController}. * {@link com.android.settings.core.BasePreferenceController}.
*/ */
public List<SliceData> getSliceData() { public List<SliceData> getSliceData() {
if (!mSliceData.isEmpty()) { List<SliceData> sliceData = new ArrayList<>();
return mSliceData;
}
final Collection<Class> indexableClasses = FeatureFactory.getFactory(mContext) final Collection<Class> indexableClasses = FeatureFactory.getFactory(mContext)
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues(); .getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
@@ -117,12 +112,12 @@ class SliceDataConverter {
final List<SliceData> providerSliceData = getSliceDataFromProvider(provider, final List<SliceData> providerSliceData = getSliceDataFromProvider(provider,
fragmentName); fragmentName);
mSliceData.addAll(providerSliceData); sliceData.addAll(providerSliceData);
} }
final List<SliceData> a11ySliceData = getAccessibilitySliceData(); final List<SliceData> a11ySliceData = getAccessibilitySliceData();
mSliceData.addAll(a11ySliceData); sliceData.addAll(a11ySliceData);
return mSliceData; return sliceData;
} }
private List<SliceData> getSliceDataFromProvider(SearchIndexProvider provider, private List<SliceData> getSliceDataFromProvider(SearchIndexProvider provider,