Merge "Updated visual look for Shortcuts selection."
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index f40b008..3659dbb 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -199,11 +199,8 @@
subtypeLabel = pm.getText(property.getPackageName(), nameResId,
property.getServiceInfo().applicationInfo);
} else {
- int modeResId = subtype.getModeResId();
+ String mode = subtype.getMode();
CharSequence language = subtype.getLocale();
- CharSequence mode = modeResId == 0 ? null
- : pm.getText(property.getPackageName(), modeResId,
- property.getServiceInfo().applicationInfo);
// TODO: Use more friendly Title and UI
subtypeLabel = (mode == null ? "" : mode) + ","
+ (language == null ? "" : language);
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index d1700a6..a97c6ce 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -375,7 +375,7 @@
private int validateIpConfigFields(LinkProperties linkProperties) {
try {
String ipAddr = mIpAddressView.getText().toString();
- if (!NetworkUtils.isIpAddress(ipAddr)) {
+ if (!InetAddress.isNumeric(ipAddr)) {
return R.string.wifi_ip_settings_invalid_ip_address;
}
InetAddress inetAddr = InetAddress.getByName(ipAddr);
@@ -389,19 +389,19 @@
linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength));
String gateway = mGatewayView.getText().toString();
- if (!NetworkUtils.isIpAddress(gateway)) {
+ if (!InetAddress.isNumeric(gateway)) {
return R.string.wifi_ip_settings_invalid_gateway;
}
linkProperties.setGateway(InetAddress.getByName(gateway));
String dns = mDns1View.getText().toString();
- if (!NetworkUtils.isIpAddress(dns)) {
+ if (!InetAddress.isNumeric(dns)) {
return R.string.wifi_ip_settings_invalid_dns;
}
linkProperties.addDns(InetAddress.getByName(dns));
if (mDns2View.length() > 0) {
dns = mDns2View.getText().toString();
- if (!NetworkUtils.isIpAddress(dns)) {
+ if (!InetAddress.isNumeric(dns)) {
return R.string.wifi_ip_settings_invalid_dns;
}
linkProperties.addDns(InetAddress.getByName(dns));