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

Merge "Improve some comments of strings and codes" into qt-dev

Browse Source 
am: 0bc3fac6d9

Change-Id: I7638a753e235ae4dee29cb0294918e896089d85e
This commit is contained in:
cosmohsieh
2019-04-22 18:01:09 -07:00
committed by android-build-merger
parent 012ba13cb3 0bc3fac6d9
commit b7fc587b5b
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -469,13 +469,12 @@ public class WifiSettings extends RestrictedSettingsFragment
return;
}
// "forget" for normal saved network. And "disconnect" for ephemeral network because we
// could only disconnect it and put it in blacklists so it won't be used again.
if (mSelectedAccessPoint.isEphemeral()) {
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */,
R.string.wifi_disconnect_button_text);
} else if (mSelectedAccessPoint.isSaved()) {
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
// "forget" for normal saved network. And "disconnect" for ephemeral network because it
// could only be disconnected and be put in blacklists so it won't be used again.
if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
final int stringId = mSelectedAccessPoint.isEphemeral() ?
R.string.wifi_disconnect_button_text : R.string.forget;
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, stringId);
}
if (mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {