From 2fca2ebddfca4e704d8676bec15bd2b6750ee933 Mon Sep 17 00:00:00 2001 From: pkanwar Date: Mon, 8 May 2017 18:48:56 -0700 Subject: [PATCH] Remove Sleep options from Advanced wifi. Sleep options are not relevant any more. This CL removes them from the settings code. Bug: 35994481 Test: make RunSettingsRoboTests Change-Id: Ibd0b33ded3aa2da3df73c519611c915deed6310f --- res/values/arrays.xml | 32 ------ res/xml/wifi_configure_settings.xml | 6 - .../settings/wifi/ConfigureWifiSettings.java | 1 - .../WifiSleepPolicyPreferenceController.java | 104 ------------------ 4 files changed, 143 deletions(-) delete mode 100644 src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 873576c7041..22f8fa4f7bf 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -326,38 +326,6 @@ Excellent - - - - Always - - Only when plugged in - - Never - - - - - - Always - - Only when plugged in - - Never - - - - - - - 2 - - 1 - - 0 - - diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml index 14990a5b1c9..b18a721c584 100644 --- a/res/xml/wifi_configure_settings.xml +++ b/res/xml/wifi_configure_settings.xml @@ -41,12 +41,6 @@ android:title="@string/wifi_cellular_data_fallback_title" android:summary="@string/wifi_cellular_data_fallback_summary"/> - - diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 24d62adc8c9..93be076efd5 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -85,7 +85,6 @@ public class ConfigureWifiSettings extends DashboardFragment { controllers.add(new NotifyOpenNetworksPreferenceController(context, networkScoreManagerWrapper, notificationChannelHelper, getPackageManager())); controllers.add(mUseOpenWifiPreferenceController); - controllers.add(new WifiSleepPolicyPreferenceController(context)); controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager)); controllers.add(new CellularFallbackPreferenceController(context)); controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), wifiManager)); diff --git a/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java b/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java deleted file mode 100644 index 3e7911b6ad1..00000000000 --- a/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.wifi; - -import android.content.Context; -import android.provider.Settings; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.util.Log; -import android.widget.Toast; - -import com.android.settings.R; -import com.android.settings.Utils; -import com.android.settings.core.PreferenceController; - -import static com.android.internal.os.MemoryPowerCalculator.TAG; - -public class WifiSleepPolicyPreferenceController extends PreferenceController implements - Preference.OnPreferenceChangeListener { - - private static final String KEY_SLEEP_POLICY = "sleep_policy"; - - public WifiSleepPolicyPreferenceController(Context context) { - super(context); - } - - @Override - public boolean isAvailable() { - return true; - } - - @Override - public String getPreferenceKey() { - return KEY_SLEEP_POLICY; - } - - @Override - public void updateState(Preference preference) { - ListPreference sleepPolicyPref = (ListPreference) preference; - if (sleepPolicyPref != null) { - if (Utils.isWifiOnly(mContext)) { - sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only); - } - int value = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.WIFI_SLEEP_POLICY, - Settings.Global.WIFI_SLEEP_POLICY_NEVER); - String stringValue = String.valueOf(value); - sleepPolicyPref.setValue(stringValue); - updateSleepPolicySummary(sleepPolicyPref, stringValue); - } - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - try { - String stringValue = (String) newValue; - Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY, - Integer.parseInt(stringValue)); - updateSleepPolicySummary(preference, stringValue); - } catch (NumberFormatException e) { - Toast.makeText(mContext, R.string.wifi_setting_sleep_policy_error, - Toast.LENGTH_SHORT).show(); - return false; - } - return true; - } - - private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) { - if (value != null) { - String[] values = mContext.getResources().getStringArray(R.array - .wifi_sleep_policy_values); - final int summaryArrayResId = Utils.isWifiOnly(mContext) - ? R.array.wifi_sleep_policy_entries_wifi_only - : R.array.wifi_sleep_policy_entries; - String[] summaries = mContext.getResources().getStringArray(summaryArrayResId); - for (int i = 0; i < values.length; i++) { - if (value.equals(values[i])) { - if (i < summaries.length) { - sleepPolicyPref.setSummary(summaries[i]); - return; - } - } - } - } - - sleepPolicyPref.setSummary(""); - Log.e(TAG, "Invalid sleep policy value: " + value); - } - -}