diff --git a/res/drawable-hdpi/wifi_assistant_card.png b/res/drawable-hdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..5a7e6d117d3
Binary files /dev/null and b/res/drawable-hdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-hdpi/wifi_assistant_card_tablet.png b/res/drawable-hdpi/wifi_assistant_card_tablet.png
new file mode 100644
index 00000000000..d309533c3c7
Binary files /dev/null and b/res/drawable-hdpi/wifi_assistant_card_tablet.png differ
diff --git a/res/drawable-mdpi/wifi_assistant_card.png b/res/drawable-mdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..bb2114ccd91
Binary files /dev/null and b/res/drawable-mdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-mdpi/wifi_assistant_card_tablet.png b/res/drawable-mdpi/wifi_assistant_card_tablet.png
new file mode 100644
index 00000000000..0ca411c4170
Binary files /dev/null and b/res/drawable-mdpi/wifi_assistant_card_tablet.png differ
diff --git a/res/drawable-xhdpi/wifi_assistant_card.png b/res/drawable-xhdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..1f8a5b90712
Binary files /dev/null and b/res/drawable-xhdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-xhdpi/wifi_assistant_card_tablet.png b/res/drawable-xhdpi/wifi_assistant_card_tablet.png
new file mode 100644
index 00000000000..570a6635907
Binary files /dev/null and b/res/drawable-xhdpi/wifi_assistant_card_tablet.png differ
diff --git a/res/drawable-xxhdpi/wifi_assistant_card.png b/res/drawable-xxhdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..65211cdc08f
Binary files /dev/null and b/res/drawable-xxhdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-xxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxhdpi/wifi_assistant_card_tablet.png
new file mode 100644
index 00000000000..2941b144d27
Binary files /dev/null and b/res/drawable-xxhdpi/wifi_assistant_card_tablet.png differ
diff --git a/res/drawable-xxxhdpi/wifi_assistant_card.png b/res/drawable-xxxhdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..e79330b8685
Binary files /dev/null and b/res/drawable-xxxhdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png
new file mode 100644
index 00000000000..54120fb61bf
Binary files /dev/null and b/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png differ
diff --git a/res/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml
new file mode 100644
index 00000000000..a1917bae708
--- /dev/null
+++ b/res/layout/wifi_assistant_card.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values-h480dp/dimens.xml b/res/values-h480dp/dimens.xml
index 6610b4f753d..d5e3e27c719 100644
--- a/res/values-h480dp/dimens.xml
+++ b/res/values-h480dp/dimens.xml
@@ -16,4 +16,10 @@
160dp
+
+
+ 16dp
+ 16dp
+ 25dp
+ 16dp
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index d35d97331b0..8d560eae65b 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -70,4 +70,9 @@
24dp
32dp
+
+ 24dp
+ 24dp
+ 25dp
+ 24dp
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index b1d084f119b..981c93602c9 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -50,4 +50,9 @@
80dp
80dp
+
+ 24dp
+ 24dp
+ 25dp
+ 24dp
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0b3ea391989..1d0c77bf966 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,6 +40,7 @@
#33ffffff
#33000000
#ff009587
+ #ff009587
#ffffffff
#80000000
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 32a2fffbd80..ae654e4ade2 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -165,4 +165,10 @@
32dp
16dp
+
+ 16dp
+ 16dp
+ 25dp
+ 16dp
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04e0b9a77d7..431e38d22a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1288,6 +1288,8 @@
Remember settings
+
+ Introducing\nWi\u2011Fi Assistant
Wi\u2011Fi Assistant
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cea615e4fdf..6a8cb79c5b1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -262,6 +262,16 @@
- 18sp
+
+
+
+
33554432
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 1237715e2a3..07212486ec0 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -25,7 +25,6 @@ import com.android.settings.SettingsActivity;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.wifi.p2p.WifiP2pSettings;
import android.app.Activity;
import android.app.Dialog;
@@ -37,10 +36,12 @@ import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.content.res.TypedArray;
+import android.content.SharedPreferences;
import android.location.LocationManager;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
+import android.net.NetworkScoreManager;
import android.net.wifi.ScanResult;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
@@ -59,7 +60,9 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
+import android.view.View.OnClickListener;
import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
@@ -82,6 +85,7 @@ public class WifiSettings extends RestrictedSettingsFragment
implements DialogInterface.OnClickListener, Indexable {
private static final String TAG = "WifiSettings";
+
/* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
private static final int MENU_ID_SAVED_NETWORK = Menu.FIRST + 2;
@@ -93,6 +97,13 @@ public class WifiSettings extends RestrictedSettingsFragment
private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
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_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;
/* package */ static final int WPS_PBC_DIALOG_ID = 2;
private static final int WPS_PIN_DIALOG_ID = 3;
@@ -142,6 +153,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private boolean mDlgEdit;
private AccessPoint mDlgAccessPoint;
private Bundle mAccessPointSavedState;
+ private Preference mWifiAssistant;
/** verbose logging flag. this flag is set thru developer debugging options
* and used so as to assist with in-the-field WiFi connectivity debugging */
@@ -149,6 +161,105 @@ public class WifiSettings extends RestrictedSettingsFragment
/* End of "used in Wifi Setup context" */
+ /** Holds the Wifi Assistant Card. */
+ private static class WifiAssistantPreference extends Preference {
+ final WifiSettings mWifiSettings;
+
+ public WifiAssistantPreference(WifiSettings wifiSettings) {
+ super(wifiSettings.getActivity());
+ mWifiSettings = wifiSettings;
+ setLayoutResource(R.layout.wifi_assistant_card);
+ }
+
+ @Override
+ public void onBindView(View view) {
+ super.onBindView(view);
+ final Preference pref = this;
+ Button setup = (Button)view.findViewById(R.id.setup);
+ Button noThanks = (Button)view.findViewById(R.id.no_thanks_button);
+
+ if (setup != null && noThanks != null) {
+ setup.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(NetworkScoreManager.ACTION_CHANGE_ACTIVE);
+ intent.putExtra(NetworkScoreManager.EXTRA_PACKAGE_NAME, "wifi-assistant");
+ mWifiSettings.startActivity(intent);
+ mWifiSettings.setWifiAssistantTimeout();
+ mWifiSettings.getPreferenceScreen().removePreference(pref);
+ }
+ });
+
+ noThanks.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mWifiSettings.setWifiAssistantTimeout();
+ mWifiSettings.getPreferenceScreen().removePreference(pref);
+ }
+ });
+ }
+ }
+ }
+
+ /** A restricted multimap for use in constructAccessPoints */
+ private static class Multimap {
+ private final HashMap> store = new HashMap>();
+ /** retrieve a non-null list of values with key K */
+ List getAll(K key) {
+ List values = store.get(key);
+ return values != null ? values : Collections.emptyList();
+ }
+
+ void put(K key, V val) {
+ List curVals = store.get(key);
+ if (curVals == null) {
+ curVals = new ArrayList(3);
+ store.put(key, curVals);
+ }
+ curVals.add(val);
+ }
+ }
+
+ private static class Scanner extends Handler {
+ private int mRetry = 0;
+ private WifiSettings mWifiSettings = null;
+
+ Scanner(WifiSettings wifiSettings) {
+ mWifiSettings = wifiSettings;
+ }
+
+ void resume() {
+ if (!hasMessages(0)) {
+ sendEmptyMessage(0);
+ }
+ }
+
+ void forceScan() {
+ removeMessages(0);
+ sendEmptyMessage(0);
+ }
+
+ void pause() {
+ mRetry = 0;
+ removeMessages(0);
+ }
+
+ @Override
+ public void handleMessage(Message message) {
+ if (mWifiSettings.mWifiManager.startScan()) {
+ mRetry = 0;
+ } else if (++mRetry >= 3) {
+ mRetry = 0;
+ Activity activity = mWifiSettings.getActivity();
+ if (activity != null) {
+ Toast.makeText(activity, R.string.wifi_fail_to_scan, Toast.LENGTH_LONG).show();
+ }
+ return;
+ }
+ sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);
+ }
+ }
+
public WifiSettings() {
super(DISALLOW_CONFIG_WIFI);
mFilter = new IntentFilter();
@@ -168,7 +279,7 @@ public class WifiSettings extends RestrictedSettingsFragment
}
};
- mScanner = new Scanner();
+ mScanner = new Scanner(this);
}
@Override
@@ -248,6 +359,8 @@ public class WifiSettings extends RestrictedSettingsFragment
addPreferencesFromResource(R.xml.wifi_settings);
+ mWifiAssistant = new WifiAssistantPreference(this);
+
mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
getListView().setEmptyView(mEmptyView);
registerForContextMenu(getListView());
@@ -322,7 +435,7 @@ public class WifiSettings extends RestrictedSettingsFragment
.setIcon(ta.getDrawable(0))
.setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- if (savedNetworksExist){
+ if (savedNetworksExist) {
menu.add(Menu.NONE, MENU_ID_SAVED_NETWORK, 0, R.string.wifi_saved_access_points_label)
.setIcon(ta.getDrawable(0))
.setEnabled(wifiIsEnabled)
@@ -483,7 +596,7 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
mSelectedAccessPoint.generateOpenNetworkConfig();
- if (!savedNetworksExist){
+ if (!savedNetworksExist) {
savedNetworksExist = true;
getActivity().invalidateOptionsMenu();
}
@@ -566,9 +679,14 @@ public class WifiSettings extends RestrictedSettingsFragment
final Collection accessPoints =
constructAccessPoints(getActivity(), mWifiManager, mLastInfo, mLastState);
getPreferenceScreen().removeAll();
- if(accessPoints.size() == 0) {
+ if (accessPoints.size() == 0) {
addMessagePreference(R.string.wifi_empty_list_wifi_on);
}
+
+ if (showWifiAssistantCard()) {
+ getPreferenceScreen().addPreference(mWifiAssistant);
+ }
+
for (AccessPoint accessPoint : accessPoints) {
getPreferenceScreen().addPreference(accessPoint);
}
@@ -588,6 +706,34 @@ public class WifiSettings extends RestrictedSettingsFragment
}
}
+ private boolean showWifiAssistantCard() {
+ SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+ long lastTimeoutEndTime = sharedPreferences.getLong(KEY_ASSISTANT_START_TIME, 0);
+ long dismissTime = sharedPreferences.getLong(KEY_ASSISTANT_DISMISS_TIME, 0);
+
+ return ((System.currentTimeMillis() - lastTimeoutEndTime) > dismissTime);
+ }
+
+ private void setWifiAssistantTimeout() {
+ SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+ long dismissTime = sharedPreferences.getLong(KEY_ASSISTANT_DISMISS_TIME, 0);
+
+ 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();
+ }
+
private void setOffMessage() {
if (mEmptyView != null) {
mEmptyView.setCompoundDrawablesWithIntrinsicBounds(0,
@@ -663,25 +809,6 @@ public class WifiSettings extends RestrictedSettingsFragment
return accessPoints;
}
- /** A restricted multimap for use in constructAccessPoints */
- private static class Multimap {
- private final HashMap> store = new HashMap>();
- /** retrieve a non-null list of values with key K */
- List getAll(K key) {
- List values = store.get(key);
- return values != null ? values : Collections.emptyList();
- }
-
- void put(K key, V val) {
- List curVals = store.get(key);
- if (curVals == null) {
- curVals = new ArrayList(3);
- store.put(key, curVals);
- }
- curVals.add(val);
- }
- }
-
private void handleEvent(Context context, Intent intent) {
String action = intent.getAction();
if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
@@ -773,41 +900,6 @@ public class WifiSettings extends RestrictedSettingsFragment
mScanner.pause();
}
- private class Scanner extends Handler {
- private int mRetry = 0;
-
- void resume() {
- if (!hasMessages(0)) {
- sendEmptyMessage(0);
- }
- }
-
- void forceScan() {
- removeMessages(0);
- sendEmptyMessage(0);
- }
-
- void pause() {
- mRetry = 0;
- removeMessages(0);
- }
-
- @Override
- public void handleMessage(Message message) {
- if (mWifiManager.startScan()) {
- mRetry = 0;
- } else if (++mRetry >= 3) {
- mRetry = 0;
- Activity activity = getActivity();
- if (activity != null) {
- Toast.makeText(activity, R.string.wifi_fail_to_scan, Toast.LENGTH_LONG).show();
- }
- return;
- }
- sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);
- }
- }
-
/**
* Renames/replaces "Next" button when appropriate. "Next" button usually exists in
* Wifi setup screens, not in usual wifi settings screen.