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

Use getTitle() for AccessPoint display name

Browse Source 
Instead of getSsidStr(), AccessPoint display names should use
getTitle() to accomodate Passpoint networks which use a provider
name instead of a single ssid. This change allows the provider
name to be displayed in the network details page, the long
press wifi dialog, and the config editing dialog.

Bug: 118705403
Test: atest WifiSettingsTest
Change-Id: I930d6218c7e464ad20c0c61130e0cb9ce315d9a2
This commit is contained in:
Quang Luong
2019-02-20 17:45:32 -08:00
parent cc39557d87
commit 0df143834a
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -265,11 +265,7 @@ public class WifiConfigController implements TextWatcher,
configureSecuritySpinner(); configureSecuritySpinner();
mConfigUi.setSubmitButton(res.getString(R.string.wifi_save)); mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
} else { } else {
if (!mAccessPoint.isPasspointConfig()) { mConfigUi.setTitle(mAccessPoint.getTitle());
mConfigUi.setTitle(mAccessPoint.getSsid());
} else {
mConfigUi.setTitle(mAccessPoint.getConfigName());
}
ViewGroup group = (ViewGroup) mView.findViewById(R.id.info); ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);

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

@@ -483,7 +483,7 @@ public class WifiSettings extends RestrictedSettingsFragment
if (preference instanceof LongPressAccessPointPreference) { if (preference instanceof LongPressAccessPointPreference) {
mSelectedAccessPoint = mSelectedAccessPoint =
((LongPressAccessPointPreference) preference).getAccessPoint(); ((LongPressAccessPointPreference) preference).getAccessPoint();
menu.setHeaderTitle(mSelectedAccessPoint.getSsid()); menu.setHeaderTitle(mSelectedAccessPoint.getTitle());
if (mSelectedAccessPoint.isConnectable()) { if (mSelectedAccessPoint.isConnectable()) {
menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect); menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
} }

2
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -327,7 +327,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
mContext.getDrawable(R.drawable.ic_settings_widget_background)); mContext.getDrawable(R.drawable.ic_settings_widget_background));
iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
mEntityHeaderController.setLabel(mAccessPoint.getSsidStr()); mEntityHeaderController.setLabel(mAccessPoint.getTitle());
} }
@Override @Override

6
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -384,9 +384,9 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
public void entityHeader_shouldHaveLabelSetToSsid() { public void entityHeader_shouldHaveLabelSetToTitle() {
String label = "ssid"; String label = "title";
when(mockAccessPoint.getSsidStr()).thenReturn(label); when(mockAccessPoint.getTitle()).thenReturn(label);
displayAndResume(); displayAndResume();