Merge "Rollback the See More Intent for non-provider model design" into sc-dev
diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
index 0fa1e46..53c0f20 100644
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ b/src/com/android/settings/panel/InternetConnectivityPanel.java
@@ -30,6 +30,7 @@
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 @@
@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
diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
index 837cf7a..c13d368 100644
--- a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
+++ b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
@@ -255,8 +255,8 @@
}
@Test
- public void getSeeMoreIntent_shouldBeNull() {
- assertThat(mPanel.getSeeMoreIntent()).isNull();
+ public void getSeeMoreIntent_shouldNotNull() {
+ assertThat(mPanel.getSeeMoreIntent()).isNotNull();
}
@Test