diff options
author | Russell Brenner <russellbrenner@google.com> | 2012-10-19 18:55:14 -0700 |
---|---|---|
committer | Russell Brenner <russellbrenner@google.com> | 2012-10-19 18:55:14 -0700 |
commit | 56a166e9e3cac96246bd724ceea96846fc9e41e1 (patch) | |
tree | 85da6cad3da8a9109277ee5cec5a4b0ec3f8597b /src | |
parent | d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9 (diff) | |
download | packages_apps_settings-56a166e9e3cac96246bd724ceea96846fc9e41e1.zip packages_apps_settings-56a166e9e3cac96246bd724ceea96846fc9e41e1.tar.gz packages_apps_settings-56a166e9e3cac96246bd724ceea96846fc9e41e1.tar.bz2 |
Added info about why Wi-Fi is required
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.
Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 9c3f07f..aedb79e 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -152,6 +152,9 @@ public class WifiSettings extends SettingsPreferenceFragment // this boolean extra shows a custom button that we can control protected static final String EXTRA_SHOW_CUSTOM_BUTTON = "wifi_show_custom_button"; + // show a text regarding data charges when wifi connection is required during setup wizard + protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info"; + // this boolean extra is set if we are being invoked by the Setup Wizard private static final String EXTRA_IS_FIRST_RUN = "firstRun"; @@ -238,7 +241,8 @@ public class WifiSettings extends SettingsPreferenceFragment }); } - if (getActivity().getIntent().getBooleanExtra(EXTRA_SHOW_CUSTOM_BUTTON, false)) { + Intent intent = getActivity().getIntent(); + if (intent.getBooleanExtra(EXTRA_SHOW_CUSTOM_BUTTON, false)) { view.findViewById(R.id.button_bar).setVisibility(View.VISIBLE); view.findViewById(R.id.back_button).setVisibility(View.INVISIBLE); view.findViewById(R.id.skip_button).setVisibility(View.INVISIBLE); @@ -258,6 +262,10 @@ public class WifiSettings extends SettingsPreferenceFragment }); } + if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) { + view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE); + } + return view; } else { return super.onCreateView(inflater, container, savedInstanceState); |