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

Commit 4f828e38 authored by Goven Liu's avatar Goven Liu Committed by Automerger Merge Worker
Browse files

Merge "[Wi-Fi] Use getUriHelpString() result to judge if show the Openroaming... 

Merge "[Wi-Fi] Use getUriHelpString() result to judge if show the Openroaming help button." into rvc-dev am: bbdfb53c am: 7e36e69f am: b10d6e37 am: dc732154

Change-Id: If8878950f6619c16259e6af3467959acf15c50da
parents 5c87fb29 dc732154

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

+2 −3
Original line number Diff line number Diff line
@@ -102,12 +102,11 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt 
        // Turn off divider

        view.findViewById(R.id.two_target_divider).setVisibility(View.INVISIBLE);



        // Enable the icon button when this Entry is a canManageSubscription entry.

        // Enable the icon button when the help string in this WifiEntry is not null.

        final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button);

        final ImageView frictionImageView = (ImageView) view.findViewById(

                R.id.friction_icon);

        if (mWifiEntry.canManageSubscription() && !mWifiEntry.isSaved()

                && !mWifiEntry.isSubscription()

        if (mWifiEntry.getHelpUriString() != null

                && mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_DISCONNECTED) {

            final Drawable drawablehelp = getDrawable(R.drawable.ic_help);

            drawablehelp.setTintList(

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

+6 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class WifiEntryPreferenceTest { 


    private static final String MOCK_TITLE = "title";

    private static final String MOCK_SUMMARY = "summary";



    private static final String FAKE_URI_STRING = "fakeuri";



    @Before

    public void setUp() {
@@ -155,22 +155,23 @@ public class WifiEntryPreferenceTest { 
    }



    @Test

    public void canManageSubscription_shouldSetImageButtonVisible() {

        when(mMockWifiEntry.canManageSubscription()).thenReturn(true);

    public void notNull_whenGetHelpUriString_shouldSetImageButtonVisible() {

        when(mMockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);

        final WifiEntryPreference pref =

                new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector);

        final LayoutInflater inflater = LayoutInflater.from(mContext);

        final View view = inflater.inflate(pref.getLayoutResource(), new LinearLayout(mContext),

                false);

        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(view);



        pref.onBindViewHolder(holder);



        assertThat(view.findViewById(R.id.icon_button).getVisibility()).isEqualTo(View.VISIBLE);

    }



    @Test

    public void helpButton_whenCanManageSubscription_shouldSetCorrectContentDescription() {

        when(mMockWifiEntry.canManageSubscription()).thenReturn(true);

    public void helpButton_whenGetHelpUriStringNotNull_shouldSetCorrectContentDescription() {

        when(mMockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);

        final WifiEntryPreference pref =

                new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector);

        final LayoutInflater inflater = LayoutInflater.from(mContext);