PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I28e9ef93d74c6063545fac0b6be940f4991d61e8
This commit is contained in:
TreeHugger Robot
2021-06-22 13:05:19 +00:00
committed by Automerger Merge Worker
parent 406b95300d ed23563724
commit ae2793958d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/panel/InternetConnectivityPanel.java
View File

@@ -30,6 +30,7 @@ import android.net.wifi.WifiManager;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerExecutor; import android.os.HandlerExecutor;
import android.os.Looper; import android.os.Looper;
import android.provider.Settings;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback; import android.telephony.TelephonyCallback;
@@ -235,7 +236,10 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
@Override @Override
public Intent getSeeMoreIntent() { 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 @Override

4
tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
View File

@@ -255,8 +255,8 @@ public class InternetConnectivityPanelTest {
} }
@Test @Test
public void getSeeMoreIntent_shouldBeNull() { public void getSeeMoreIntent_shouldNotNull() {
assertThat(mPanel.getSeeMoreIntent()).isNull(); assertThat(mPanel.getSeeMoreIntent()).isNotNull();
} }
@Test @Test