diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-06-25 19:51:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-25 19:51:46 -0700 |
| commit | 40686ee81f95699d7a83ccb1ef1be52c0c746d4f (patch) | |
| tree | 1fddcd602b890c75a1036a293273369bb59e6439 /res/xml | |
| parent | c9d2f15fc5012066b62f5a59aff5c7aaf283c491 (diff) | |
| parent | 15fe0e47958d248300c2f26a463172181b137aca (diff) | |
| download | packages_apps_Settings-40686ee81f95699d7a83ccb1ef1be52c0c746d4f.zip packages_apps_Settings-40686ee81f95699d7a83ccb1ef1be52c0c746d4f.tar.gz packages_apps_Settings-40686ee81f95699d7a83ccb1ef1be52c0c746d4f.tar.bz2 | |
am 15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread
Merge commit '15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp
* commit '15fe0e47958d248300c2f26a463172181b137aca':
Allow soft AP settings config before bring up
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/tether_prefs.xml | 1 | ||||
| -rw-r--r-- | res/xml/wifi_ap_settings.xml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml index 6e3d062..77fc7c6 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -28,7 +28,6 @@ <PreferenceScreen android:key="wifi_ap_settings" - android:dependency="enable_wifi_ap" android:title="@string/wifi_tether_settings_text" android:summary="@string/wifi_tether_settings_subtext" > <intent diff --git a/res/xml/wifi_ap_settings.xml b/res/xml/wifi_ap_settings.xml index ad21714..9e26154 100644 --- a/res/xml/wifi_ap_settings.xml +++ b/res/xml/wifi_ap_settings.xml @@ -24,7 +24,6 @@ <Preference android:key="wifi_ap_ssid_and_security" - android:dependency="enable_wifi_ap" android:title="@string/wifi_tether_configure_ap_text" android:persistent="false" /> |