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 am: b2e8d34359

Browse Source 
am: 5aa4d7b67e

* commit '5aa4d7b67ea1ed5a4dc4383a63744428fec9bde1':
  Don't show disabled packages in the WebView implementation Dev setting.
This commit is contained in:
Gustav Sennton
2016-02-22 10:16:39 +00:00
committed by android-build-merger
parent 0bed06f35c 5aa4d7b67e
commit f2f4de4f25
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");
return;
}
String[] options = new String[providers.length];
String[] values = new String[providers.length];
ArrayList<String> options = new ArrayList<String>();
ArrayList<String> values = new ArrayList<String>();
for(int n = 0; n < providers.length; n++) {
options[n] = providers[n].description;
values[n] = providers[n].packageName;
if (isPackageEnabled(providers[n].packageName)) {
options.add(providers[n].description);
values.add(providers[n].packageName);
}
mWebViewProvider.setEntries(options);
mWebViewProvider.setEntryValues(values);
}
mWebViewProvider.setEntries(options.toArray(new String[options.size()]));
mWebViewProvider.setEntryValues(values.toArray(new String[values.size()]));
String value = mWebViewUpdateService.getCurrentWebViewPackageName();
if (value == null) {
value = "";
}
for (int i = 0; i < values.length; i++) {
if (value.contentEquals(values[i])) {
for (int i = 0; i < values.size(); i++) {
if (value.contentEquals(values.get(i))) {
mWebViewProvider.setValueIndex(i);
return;
}