Merge "[Provider Model] Don't dismiss quick settings when config Wi-Fi network" into sc-qpr1-dev am: 24ccad0ba2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746808 Change-Id: Icb5c7248ac63f153825a0b7542a19cc6708ac2e6
This commit is contained in:
@@ -741,7 +741,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback,
|
|||||||
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG")
|
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG")
|
||||||
.putExtra(EXTRA_CHOSEN_WIFI_ENTRY_KEY, mWifiEntry.getKey());
|
.putExtra(EXTRA_CHOSEN_WIFI_ENTRY_KEY, mWifiEntry.getKey());
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
mActivityStarter.startActivity(intent, true);
|
mActivityStarter.startActivity(intent, false /* dismissShade */);
|
||||||
} else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
|
} else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
|
||||||
Toast.makeText(mContext, R.string.wifi_failed_connect_message,
|
Toast.makeText(mContext, R.string.wifi_failed_connect_message,
|
||||||
Toast.LENGTH_SHORT).show();
|
Toast.LENGTH_SHORT).show();
|
||||||
|
|||||||
Reference in New Issue
Block a user