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

am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev

Browse Source 
* commit '275e6f75208c08eb925048a330ed4aab96e51033':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
This commit is contained in:
Lorenzo Colitti
2015-06-10 15:42:35 +00:00
committed by Android Git Automerger
parent f0e5a75508 275e6f7520
commit a41c3580a9
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1591,7 +1591,7 @@
<string name="wifi_hotspot_connect">CONNECT</string>
<!-- Dialog text to tell the user that the selected network does not have Internet access. -->
<string name="no_internet_access_text">This network has no Internet access. Use this network anyway?</string>
<string name="no_internet_access_text">This network has no Internet access. Stay connected?</string>
<string name="no_internet_access_remember">Don\u2019t ask again for this network</string>
<!-- Button label to connect to a Wi-Fi network -->

16
src/com/android/settings/wifi/WifiNoInternetDialog.java
View File

@@ -54,15 +54,21 @@ public final class WifiNoInternetDialog extends AlertActivity implements
final Intent intent = getIntent();
if (intent == null ||
!intent.getAction().equals(ConnectivityManager.ACTION_PROMPT_UNVALIDATED)) {
!intent.getAction().equals(ConnectivityManager.ACTION_PROMPT_UNVALIDATED) ||
!"netId".equals(intent.getScheme())) {
Log.e(TAG, "Unexpected intent " + intent + ", exiting");
finish();
return;
}
mNetwork = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
try {
mNetwork = new Network(Integer.parseInt(intent.getData().getSchemeSpecificPart()));
} catch (NullPointerException|NumberFormatException e) {
mNetwork = null;
}
if (mNetwork == null) {
Log.e(TAG, "ACTION_PROMPT_UNVALIDATED for null network, exiting");
Log.e(TAG, "Can't determine network from '" + intent.getData() + "' , exiting");
finish();
return;
}
@@ -112,8 +118,8 @@ public final class WifiNoInternetDialog extends AlertActivity implements
final AlertController.AlertParams ap = mAlertParams;
ap.mTitle = mNetworkName;
ap.mMessage = getString(R.string.no_internet_access_text);
ap.mPositiveButtonText = getString(android.R.string.ok);
ap.mNegativeButtonText = getString(android.R.string.cancel);
ap.mPositiveButtonText = getString(R.string.yes);
ap.mNegativeButtonText = getString(R.string.no);
ap.mPositiveButtonListener = this;
ap.mNegativeButtonListener = this;