Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure settings tiles pick up locale changes" into nyc-dev

Browse Source 
am: fd2e0df

* commit 'fd2e0dfc93ce786ae6ac4a016a2b53bb1862181c':
  Make sure settings tiles pick up locale changes
This commit is contained in:
Jason Monk
2016-03-28 14:54:36 +00:00
committed by android-build-merger
parent 77ca8c6e63 fd2e0dfc93
commit 51ff57ab55
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
View File

@@ -41,6 +41,7 @@ import android.widget.AdapterView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Toolbar; import android.widget.Toolbar;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.applications.InterestingConfigChanges;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -55,6 +56,7 @@ public class SettingsDrawerActivity extends Activity {
private static List<DashboardCategory> sDashboardCategories; private static List<DashboardCategory> sDashboardCategories;
private static HashMap<Pair<String, String>, Tile> sTileCache; private static HashMap<Pair<String, String>, Tile> sTileCache;
private static InterestingConfigChanges sConfigTracker;
private final PackageReceiver mPackageReceiver = new PackageReceiver(); private final PackageReceiver mPackageReceiver = new PackageReceiver();
private final List<CategoryListener> mCategoryListeners = new ArrayList<>(); private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
@@ -208,6 +210,7 @@ public class SettingsDrawerActivity extends Activity {
public List<DashboardCategory> getDashboardCategories() { public List<DashboardCategory> getDashboardCategories() {
if (sDashboardCategories == null) { if (sDashboardCategories == null) {
sTileCache = new HashMap<>(); sTileCache = new HashMap<>();
sConfigTracker = new InterestingConfigChanges();
sDashboardCategories = TileUtils.getCategories(this, sTileCache); sDashboardCategories = TileUtils.getCategories(this, sTileCache);
} }
return sDashboardCategories; return sDashboardCategories;
@@ -267,6 +270,9 @@ public class SettingsDrawerActivity extends Activity {
private class CategoriesUpdater extends AsyncTask<Void, Void, List<DashboardCategory>> { private class CategoriesUpdater extends AsyncTask<Void, Void, List<DashboardCategory>> {
@Override @Override
protected List<DashboardCategory> doInBackground(Void... params) { protected List<DashboardCategory> doInBackground(Void... params) {
if (sConfigTracker.applyNewConfig(getResources())) {
sTileCache.clear();
}
return TileUtils.getCategories(SettingsDrawerActivity.this, sTileCache); return TileUtils.getCategories(SettingsDrawerActivity.this, sTileCache);
} }