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

Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev

Browse Source
This commit is contained in:
Gustav Sennton
2016-02-22 10:10:13 +00:00
committed by Android (Google) Code Review
parent e4ebcd12be 0851ede886
commit b2e8d34359
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/DevelopmentSettings.java
View File

@@ -766,22 +766,24 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
Log.e(TAG, "No WebView providers available"); Log.e(TAG, "No WebView providers available");
return; return;
} }
String[] options = new String[providers.length]; ArrayList<String> options = new ArrayList<String>();
String[] values = new String[providers.length]; ArrayList<String> values = new ArrayList<String>();
for(int n = 0; n < providers.length; n++) { for(int n = 0; n < providers.length; n++) {
options[n] = providers[n].description; if (isPackageEnabled(providers[n].packageName)) {
values[n] = providers[n].packageName; options.add(providers[n].description);
values.add(providers[n].packageName);
}
} }
mWebViewProvider.setEntries(options); mWebViewProvider.setEntries(options.toArray(new String[options.size()]));
mWebViewProvider.setEntryValues(values); mWebViewProvider.setEntryValues(values.toArray(new String[values.size()]));
String value = mWebViewUpdateService.getCurrentWebViewPackageName(); String value = mWebViewUpdateService.getCurrentWebViewPackageName();
if (value == null) { if (value == null) {
value = ""; value = "";
} }
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.size(); i++) {
if (value.contentEquals(values[i])) { if (value.contentEquals(values.get(i))) {
mWebViewProvider.setValueIndex(i); mWebViewProvider.setValueIndex(i);
return; return;
} }