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

am 88de52da: am 5d6f0a16: Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb

Browse Source 
* commit '88de52da15ed94d6eb70ae75e0df2ddbce923eb0':
  Remove / re-word some settings for WiFi-only devices.
This commit is contained in:
Amith Yamasani
2011-02-24 20:31:58 -08:00
committed by Android Git Automerger
parent e056cc2ac8 88de52da15
commit a377470486
6 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -21,6 +21,7 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
import com.android.settings.ProgressCategoryBase;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import android.app.Activity;
import android.app.AlertDialog;
@@ -211,11 +212,15 @@ public class WifiSettings extends SettingsPreferenceFragment
ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
if (pref != null) {
pref.setOnPreferenceChangeListener(this);
int value = Settings.System.getInt(getContentResolver(),
Settings.System.WIFI_SLEEP_POLICY,
Settings.System.WIFI_SLEEP_POLICY_NEVER);
pref.setValue(String.valueOf(value));
if (Utils.isWifiOnly()) {
getPreferenceScreen().removePreference(pref);
} else {
pref.setOnPreferenceChangeListener(this);
int value = Settings.System.getInt(getContentResolver(),
Settings.System.WIFI_SLEEP_POLICY,
Settings.System.WIFI_SLEEP_POLICY_NEVER);
pref.setValue(String.valueOf(value));
}
}
registerForContextMenu(getListView());