Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2360912 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

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

* commit 'f96cfad3':
  Don't show scan-always text if it is off.
parents 3303e776 f96cfad3

src/com/android/settings/wifi/WifiSettings.java

+12 −9
Original line number Diff line number Diff line
@@ -743,6 +743,8 @@ public class WifiSettings extends SettingsPreferenceFragment 
    private void setOffMessage() {

        if (mEmptyView != null) {

            mEmptyView.setText(R.string.wifi_empty_list_wifi_off);

            if (Settings.Global.getInt(getActivity().getContentResolver(),

                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1) {

                mEmptyView.append("\n\n");

                int resId;

                if (Settings.Secure.isLocationProviderEnabled(getActivity().getContentResolver(),
@@ -754,6 +756,7 @@ public class WifiSettings extends SettingsPreferenceFragment 
                CharSequence charSeq = getText(resId);

                mEmptyView.append(charSeq);

            }

        }

        getPreferenceScreen().removeAll();

    }