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

Commit 4f1ebfdc authored by Weng Su's avatar Weng Su
Browse files

Rollback the See More Intent for non-provider model design 

Bug: 191055897
Test: manual test
atest -c InternetConnectivityPanelTest
atest \
CtsProviderTestCases:android.provider.cts.SettingsPanelTest#internetPanel_seeMoreButton_launchesIntoSettings -- --abi arm64-v8a

Change-Id: Iad57dd6a9cdbc4b33f80255bdb4758f80f9f2151
parent 058027f4

src/com/android/settings/panel/InternetConnectivityPanel.java

+5 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.net.wifi.WifiManager; 
import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.Looper;

import android.provider.Settings;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyCallback;
@@ -235,7 +236,10 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve 


    @Override

    public Intent getSeeMoreIntent() {

        return null;

        // Don't remove the see more intent for non-provider model design. This intent will be

        // used when isCustomizedButtonUsed() returns false.

        return new Intent(Settings.ACTION_WIRELESS_SETTINGS)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

    }



    @Override

tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java

+2 −2
Original line number Diff line number Diff line
@@ -255,8 +255,8 @@ public class InternetConnectivityPanelTest { 
    }



    @Test

    public void getSeeMoreIntent_shouldBeNull() {

        assertThat(mPanel.getSeeMoreIntent()).isNull();

    public void getSeeMoreIntent_shouldNotNull() {

        assertThat(mPanel.getSeeMoreIntent()).isNotNull();

    }



    @Test