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

Commit 523eb32d authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Use raw string when setting wifi preference title." into oc-mr1-dev 

am: 8c3ce8d6

Change-Id: I1ad0a6ab2a9c61ddc69095621bb080d4110cec09
parents 47d1780b 8c3ce8d6

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java

+11 −7
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class AccessPointPreference extends Preference { 
            drawable.setLevel(mLevel);

        }



        mTitleView = (TextView) view.findViewById(com.android.internal.R.id.title);

        mTitleView = (TextView) view.findViewById(android.R.id.title);

        if (mTitleView != null) {

            // Attach to the end of the title view

            mTitleView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, mBadge, null);
@@ -231,12 +231,7 @@ public class AccessPointPreference extends Preference { 
     * Updates the title and summary; may indirectly call notifyChanged().

     */

    public void refresh() {

        if (mForSavedNetworks) {

            setTitle(mAccessPoint.getConfigName());

        } else {

            setTitle(mAccessPoint.getSsid());

        }



        setTitle(this, mAccessPoint, mForSavedNetworks);

        final Context context = getContext();

        int level = mAccessPoint.getLevel();

        int wifiSpeed = mAccessPoint.getSpeed();
@@ -265,6 +260,15 @@ public class AccessPointPreference extends Preference { 
        }

    }



    @VisibleForTesting

    static void setTitle(AccessPointPreference preference, AccessPoint ap, boolean savedNetworks) {

        if (savedNetworks) {

            preference.setTitle(ap.getConfigName());

        } else {

            preference.setTitle(ap.getSsidStr());

        }

    }



    /**

     * Helper method to generate content description string.

     */

packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java

+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settingslib.wifi; 


import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;
@@ -80,4 +81,19 @@ public class AccessPointPreferenceTest { 
                RuntimeEnvironment.application, pref, ap))

                .isEqualTo("ssid,connected,Wifi signal full.,Secure network");

    }



    @Test

    public void refresh_setTitle_shouldUseSsidString() {

        final String ssid = "ssid";

        final String summary = "connected";

        final int security = AccessPoint.SECURITY_WEP;

        final AccessPoint ap = new TestAccessPointBuilder(mContext)

                .setSsid(ssid)

                .setSecurity(security)

                .build();

        final AccessPointPreference preference = mock(AccessPointPreference.class);



        AccessPointPreference.setTitle(preference, ap, false /* savedNetwork */);

        verify(preference).setTitle(ssid);

    }

}