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

am f96cfad3: am 5ac90432: Don\'t show scan-always text if it is off.

Browse Source 
* commit 'f96cfad36ef62154b52e846736ebc407f4c03de6':
  Don't show scan-always text if it is off.
This commit is contained in:
Robert Greenwalt
2013-05-30 15:16:05 -07:00
committed by Android Git Automerger
parent 3303e77631 f96cfad36e
commit c236091229
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -743,16 +743,19 @@ public class WifiSettings extends SettingsPreferenceFragment
private void setOffMessage() { private void setOffMessage() {
if (mEmptyView != null) { if (mEmptyView != null) {
mEmptyView.setText(R.string.wifi_empty_list_wifi_off); mEmptyView.setText(R.string.wifi_empty_list_wifi_off);
mEmptyView.append("\n\n"); if (Settings.Global.getInt(getActivity().getContentResolver(),
int resId; Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1) {
if (Settings.Secure.isLocationProviderEnabled(getActivity().getContentResolver(), mEmptyView.append("\n\n");
LocationManager.NETWORK_PROVIDER)) { int resId;
resId = R.string.wifi_scan_notify_text_location_on; if (Settings.Secure.isLocationProviderEnabled(getActivity().getContentResolver(),
} else { LocationManager.NETWORK_PROVIDER)) {
resId = R.string.wifi_scan_notify_text_location_off; resId = R.string.wifi_scan_notify_text_location_on;
} else {
resId = R.string.wifi_scan_notify_text_location_off;
}
CharSequence charSeq = getText(resId);
mEmptyView.append(charSeq);
} }
CharSequence charSeq = getText(resId);
mEmptyView.append(charSeq);
} }
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
} }