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

Commit 765dfcb7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc

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

Change-Id: Ied5371f7d59f521720634ff53ed7d6c77ddabf5e
parents a59db064 dbd5c9cc
Loading
Loading
Loading
Loading
+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
+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