From 88c9f2889fafb53a2875418317ecd197d9aae883 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Thu, 27 Sep 2012 11:37:54 -0700 Subject: [PATCH] Show warnings when skipping Wi-Fi connection If user skips over Wi-Fi, warn about possible carrier data charges or inability to receive updates, depending on whether or not phone service is available. Note to translators: Some strings are being moved here from setup wizard. They're tagged with their msgid's so as not to trigger retranslation. Bug: 7211786 Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0 --- res/layout/setup_preference.xml | 17 +++-- res/values/strings.xml | 18 ++++- src/com/android/settings/wifi/WifiSettings.java | 89 +++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 5 deletions(-) diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index 30b33736c9..c2f698922e 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -30,7 +30,7 @@ android:gravity="bottom"> + android:layout_below="@id/title_bar" /> @@ -148,6 +148,14 @@ android:layout_margin="5dip" android:text="@string/wifi_setup_back" /> +