Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252ae8be authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge "Use getTitle() for AccessPoint display name"

parents 5cc0a77c 0df14383

src/com/android/settings/wifi/WifiConfigController.java

+1 −5
Original line number Diff line number Diff line
@@ -265,11 +265,7 @@ public class WifiConfigController implements TextWatcher, 
            configureSecuritySpinner();

            mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));

        } else {

            if (!mAccessPoint.isPasspointConfig()) {

                mConfigUi.setTitle(mAccessPoint.getSsid());

            } else {

                mConfigUi.setTitle(mAccessPoint.getConfigName());

            }

            mConfigUi.setTitle(mAccessPoint.getTitle());



            ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);

src/com/android/settings/wifi/WifiSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
        if (preference instanceof LongPressAccessPointPreference) {

            mSelectedAccessPoint =

                    ((LongPressAccessPointPreference) preference).getAccessPoint();

            menu.setHeaderTitle(mSelectedAccessPoint.getSsid());

            menu.setHeaderTitle(mSelectedAccessPoint.getTitle());

            if (mSelectedAccessPoint.isConnectable()) {

                menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);

            }

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
                mContext.getDrawable(R.drawable.ic_settings_widget_background));

        iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);



        mEntityHeaderController.setLabel(mAccessPoint.getSsidStr());

        mEntityHeaderController.setLabel(mAccessPoint.getTitle());

    }



    @Override

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

+3 −3
Original line number Diff line number Diff line
@@ -384,9 +384,9 @@ public class WifiDetailPreferenceControllerTest { 
    }



    @Test

    public void entityHeader_shouldHaveLabelSetToSsid() {

        String label = "ssid";

        when(mockAccessPoint.getSsidStr()).thenReturn(label);

    public void entityHeader_shouldHaveLabelSetToTitle() {

        String label = "title";

        when(mockAccessPoint.getTitle()).thenReturn(label);



        displayAndResume();