summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-06-10 15:16:36 +0900
committerLorenzo Colitti <lorenzo@google.com>2015-06-10 23:38:09 +0900
commitdcc61554263e91c80b27ab64a9bc80302fda096f (patch)
tree1e180765b52271275b35d0e0385e26791ef111ba
parent1276b21317d0f86bbd3f59b14d9c0c745cecfa56 (diff)
downloadpackages_apps_Settings-dcc61554263e91c80b27ab64a9bc80302fda096f.zip
packages_apps_Settings-dcc61554263e91c80b27ab64a9bc80302fda096f.tar.gz
packages_apps_Settings-dcc61554263e91c80b27ab64a9bc80302fda096f.tar.bz2
Reword "no internet access" dialog to conform with mocks.
Bug: 20081183 Bug: 20739299 Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/settings/wifi/WifiNoInternetDialog.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 967e52f..bde0a9f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1588,7 +1588,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 -->
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index f044114..9705248 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -112,8 +112,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;