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

Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev

Browse Source
This commit is contained in:
Jeff Davidson
2014-08-21 00:47:29 +00:00
committed by Android (Google) Code Review
parent 4e064343b3 978d2785fb
commit 8a983e438b
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,10 +41,10 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WpsInfo; import android.net.wifi.WpsInfo;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Parcelable;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.util.Log; import android.util.Log;
@@ -101,12 +101,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private static final int MENU_ID_MODIFY = Menu.FIRST + 8; private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9; private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
private static final String KEY_ASSISTANT_DISMISS_TIME = "wifi_assistant_dismiss_time"; private static final String KEY_ASSISTANT_DISMISS_PLATFORM = "wifi_assistant_dismiss_platform";
private static final String KEY_ASSISTANT_START_TIME = "wifi_assistant_start_time";
private static final long MILI_SECONDS_30_DAYS = 30L * 24L * 60L * 60L * 1000L;
private static final long MILI_SECONDS_90_DAYS = MILI_SECONDS_30_DAYS * 3L;
private static final long MILI_SECONDS_180_DAYS = MILI_SECONDS_90_DAYS * 2L;
public static final int WIFI_DIALOG_ID = 1; public static final int WIFI_DIALOG_ID = 1;
/* package */ static final int WPS_PBC_DIALOG_ID = 2; /* package */ static final int WPS_PBC_DIALOG_ID = 2;
@@ -336,7 +331,7 @@ public class WifiSettings extends RestrictedSettingsFragment
public void onActivityResult(int requestCode, int resultCode, Intent resultData) { public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
if (requestCode == REQUEST_ENABLE_WIFI_ASSISTANT) { if (requestCode == REQUEST_ENABLE_WIFI_ASSISTANT) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
setWifiAssistantTimeout(); disableWifiAssistantCardUntilPlatformUpgrade();
getListView().removeHeaderView(mWifiAssistantCard); getListView().removeHeaderView(mWifiAssistantCard);
mWifiAssistantApp = null; mWifiAssistantApp = null;
} }
@@ -720,10 +715,11 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences(); SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
long lastTimeoutEndTime = sharedPreferences.getLong(KEY_ASSISTANT_START_TIME, 0); int lastDismissPlatform = sharedPreferences.getInt(KEY_ASSISTANT_DISMISS_PLATFORM, 0);
long dismissTime = sharedPreferences.getLong(KEY_ASSISTANT_DISMISS_TIME, 0);
if ((System.currentTimeMillis() - lastTimeoutEndTime) <= dismissTime) { if (Build.VERSION.SDK_INT <= lastDismissPlatform) {
// User has dismissed the Wi-Fi assistant card on this SDK release. Suppress the card
// until the next major platform upgrade.
return; return;
} }
@@ -761,7 +757,7 @@ public class WifiSettings extends RestrictedSettingsFragment
noThanks.setOnClickListener(new OnClickListener() { noThanks.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
setWifiAssistantTimeout(); disableWifiAssistantCardUntilPlatformUpgrade();
getListView().removeHeaderView(mWifiAssistantCard); getListView().removeHeaderView(mWifiAssistantCard);
mWifiAssistantApp = null; mWifiAssistantApp = null;
} }
@@ -770,23 +766,10 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
} }
private void setWifiAssistantTimeout() { private void disableWifiAssistantCardUntilPlatformUpgrade() {
SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences(); SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
SharedPreferences.Editor editor = sharedPreferences.edit(); SharedPreferences.Editor editor = sharedPreferences.edit();
long dismissTime = sharedPreferences.getLong(KEY_ASSISTANT_DISMISS_TIME, 0); editor.putLong(KEY_ASSISTANT_DISMISS_PLATFORM, Build.VERSION.SDK_INT);
if (dismissTime == 0) {
dismissTime = MILI_SECONDS_30_DAYS;
} else if (dismissTime == MILI_SECONDS_30_DAYS) {
dismissTime = MILI_SECONDS_90_DAYS;
} else if (dismissTime == MILI_SECONDS_90_DAYS) {
dismissTime = MILI_SECONDS_180_DAYS;
} else if (dismissTime == MILI_SECONDS_180_DAYS) {
dismissTime = java.lang.Long.MAX_VALUE;
}
editor.putLong(KEY_ASSISTANT_DISMISS_TIME, dismissTime);
editor.putLong(KEY_ASSISTANT_START_TIME, System.currentTimeMillis());
editor.apply(); editor.apply();
} }