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

Commit 42f6baa6 authored by Quang Luong's avatar Quang Luong Committed by Automerger Merge Worker
Browse files

Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b63 am: e90bb0ae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053



Change-Id: Ia136e2a699a32d55a7566bc8143ed7396e848326
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3411c09f e90bb0ae

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+8 −14
Original line number Diff line number Diff line
@@ -637,29 +637,23 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
    }



    private void refreshTxSpeed() {

        if (mWifiInfo == null

                || mWifiEntry.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {

        String summary = mWifiEntry.getTxSpeedString();

        if (TextUtils.isEmpty(summary)) {

            mTxLinkSpeedPref.setVisible(false);

            return;

        }



        int txLinkSpeedMbps = mWifiInfo.getTxLinkSpeedMbps();

        mTxLinkSpeedPref.setVisible(txLinkSpeedMbps >= 0);

        mTxLinkSpeedPref.setSummary(mContext.getString(

                R.string.tx_link_speed, mWifiInfo.getTxLinkSpeedMbps()));

        mTxLinkSpeedPref.setVisible(true);

        mTxLinkSpeedPref.setSummary(summary);

    }



    private void refreshRxSpeed() {

        if (mWifiInfo == null

                || mWifiEntry.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {

        String summary = mWifiEntry.getRxSpeedString();

        if (TextUtils.isEmpty(summary)) {

            mRxLinkSpeedPref.setVisible(false);

            return;

        }



        int rxLinkSpeedMbps = mWifiInfo.getRxLinkSpeedMbps();

        mRxLinkSpeedPref.setVisible(rxLinkSpeedMbps >= 0);

        mRxLinkSpeedPref.setSummary(mContext.getString(

                R.string.rx_link_speed, mWifiInfo.getRxLinkSpeedMbps()));

        mRxLinkSpeedPref.setVisible(true);

        mRxLinkSpeedPref.setSummary(summary);

    }



    private void refreshSsid() {

tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java

+10 −50
Original line number Diff line number Diff line
@@ -701,10 +701,10 @@ public class WifiDetailPreferenceController2Test { 
    }



    @Test

    public void linkSpeedPref_shouldNotShowIfNotSet() {

    public void linkSpeedPref_shouldNotShowIfSpeedStringIsEmpty() {

        setUpForConnectedNetwork();

        setUpSpyController();

        when(mMockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);

        when(mMockWifiEntry.getTxSpeedString()).thenReturn("");



        displayAndResume();
@@ -712,42 +712,22 @@ public class WifiDetailPreferenceController2Test { 
    }



    @Test

    public void linkSpeedPref_shouldVisibleForConnectedNetwork() {

    public void linkSpeedPref_shouldBeVisibleIfSpeedStringIsNotEmpty() {

        setUpForConnectedNetwork();

        setUpSpyController();

        String expectedLinkSpeed = mContext.getString(R.string.tx_link_speed, TX_LINK_SPEED);

        when(mMockWifiEntry.getTxSpeedString()).thenReturn("100 Mbps");



        displayAndResume();



        verify(mMockTxLinkSpeedPref).setVisible(true);

        verify(mMockTxLinkSpeedPref).setSummary(expectedLinkSpeed);

        verify(mMockTxLinkSpeedPref).setSummary("100 Mbps");

    }



    @Test

    public void linkSpeedPref_shouldInvisibleForDisconnectedNetwork() {

        setUpForDisconnectedNetwork();



        displayAndResume();



        verify(mMockTxLinkSpeedPref).setVisible(false);

        verify(mMockTxLinkSpeedPref, never()).setSummary(any(String.class));

    }



    @Test

    public void linkSpeedPref_shouldInvisibleForNotInRangeNetwork() {

        setUpForNotInRangeNetwork();



        displayAndResume();



        verify(mMockTxLinkSpeedPref).setVisible(false);

        verify(mMockTxLinkSpeedPref, never()).setSummary(any(String.class));

    }



    @Test

    public void rxLinkSpeedPref_shouldNotShowIfNotSet() {

    public void rxLinkSpeedPref_shouldNotShowIfSpeedStringIsEmpty() {

        setUpForConnectedNetwork();

        setUpSpyController();

        when(mMockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);

        when(mMockWifiEntry.getRxSpeedString()).thenReturn("");



        displayAndResume();
@@ -755,35 +735,15 @@ public class WifiDetailPreferenceController2Test { 
    }



    @Test

    public void rxLinkSpeedPref_shouldVisibleForConnectedNetwork() {

    public void rxLinkSpeedPref_shouldBeVisibleIfSpeedStringIsNotEmpty() {

        setUpForConnectedNetwork();

        setUpSpyController();

        String expectedLinkSpeed = mContext.getString(R.string.rx_link_speed, RX_LINK_SPEED);

        when(mMockWifiEntry.getRxSpeedString()).thenReturn("100 Mbps");



        displayAndResume();



        verify(mMockRxLinkSpeedPref).setVisible(true);

        verify(mMockRxLinkSpeedPref).setSummary(expectedLinkSpeed);

    }



    @Test

    public void rxLinkSpeedPref_shouldInvisibleForDisconnectedNetwork() {

        setUpForDisconnectedNetwork();



        displayAndResume();



        verify(mMockRxLinkSpeedPref).setVisible(false);

        verify(mMockRxLinkSpeedPref, never()).setSummary(any(String.class));

    }



    @Test

    public void rxLinkSpeedPref_shouldInvisibleForNotInRangeNetwork() {

        setUpForNotInRangeNetwork();



        displayAndResume();



        verify(mMockRxLinkSpeedPref).setVisible(false);

        verify(mMockRxLinkSpeedPref, never()).setSummary(any(String.class));

        verify(mMockRxLinkSpeedPref).setSummary("100 Mbps");

    }



    @Test