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

Merge "Update some strings to match spec"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-16 18:30:09 +00:00
committed by Android (Google) Code Review
parent 7c22d1f181 50f82ac557
commit 89052d7268
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/connecteddevice/UsbModePreferenceController.java
View File

@@ -119,7 +119,7 @@ public class UsbModePreferenceController extends PreferenceController
preference.setEnabled(true);
preference.setSummary(getTitle(mode));
} else {
preference.setSummary(R.string.usb_nothing_connected);
preference.setSummary(R.string.disconnected);
preference.setEnabled(false);
}
}

8
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -150,13 +150,13 @@ public class VpnPreferenceController extends PreferenceController implements Lif
uid = userInfo.id;
}
VpnConfig vpn = vpns.get(uid);
final String vpnName;
final String summary;
if (vpn == null) {
vpnName = null;
summary = mContext.getString(R.string.vpn_disconnected_summary);
} else {
vpnName = getNameForVpnConfig(vpn, UserHandle.of(uid));
summary = getNameForVpnConfig(vpn, UserHandle.of(uid));
}
new Handler(Looper.getMainLooper()).post(() -> mPreference.setSummary(vpnName));
new Handler(Looper.getMainLooper()).post(() -> mPreference.setSummary(summary));
}
private String getNameForVpnConfig(VpnConfig cfg, UserHandle user) {