Merge "Support CTSVerifier wifi test" into rvc-qpr-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d7ad028..82c72de 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -691,6 +691,20 @@
</intent-filter>
</activity>
+ <!-- This is used internally for CTS tests and should not be used in generally. -->
+ <activity android:name=".wifi.networkrequest.NetworkRequestDialogActivity"
+ android:excludeFromRecents="true"
+ android:exported="true"
+ android:launchMode="singleTop"
+ android:permission="android.permission.NETWORK_SETTINGS"
+ android:taskAffinity=".wifi.networkrequest.NetworkRequestDialogActivity"
+ android:theme="@style/ActionDialogTheme">
+ <intent-filter>
+ <action android:name="com.android.settings.wifi.action.NETWORK_REQUEST"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
+
<!-- This logic is copied from phone.-->
<!-- Ensures there's lightweight fallback activity when no other MAIN/HOME activity is present.-->
<activity
diff --git a/res/layout/preference_access_point.xml b/res/layout/preference_access_point.xml
new file mode 100644
index 0000000..40b0841
--- /dev/null
+++ b/res/layout/preference_access_point.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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.
+ -->
+
+<!-- Based off preference_material_settings.xml except that the ripple effect is active only on
+ the left side. -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ android:background="?android:attr/selectableItemBackground"
+ android:clipToPadding="false"
+ android:paddingStart="@dimen/ap_preference_item_padding_start"
+ android:paddingEnd="@dimen/ap_preference_item_padding_end">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="start|center_vertical"
+ android:clipToPadding="false">
+
+ <FrameLayout
+ android:id="@+id/icon_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginEnd="@dimen/ap_preference_item_icon_margin_end">
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="@dimen/icon_size"
+ android:layout_height="@dimen/icon_size"
+ />
+ </FrameLayout>
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp">
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:ellipsize="marquee" />
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:maxLines="10" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <include layout="@layout/preference_two_target_divider" />
+
+ <!-- Preference should place its actual preference widget here. -->
+ <LinearLayout
+ android:id="@android:id/widget_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:minWidth="64dp"
+ android:gravity="center"
+ android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 04838bb..6c3502b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -144,4 +144,9 @@
<dimen name="alert_dialog_password_checkbox_margin_end">@*android:dimen/car_padding_3</dimen>
<dimen name="alert_dialog_password_checkbox_margin_start">@*android:dimen/car_padding_3</dimen>
<dimen name="alert_dialog_password_checkbox_margin_top">@*android:dimen/car_padding_1</dimen>
+
+ <!-- Preference access point -->
+ <dimen name="ap_preference_item_padding_start">@*android:dimen/car_keyline_1</dimen>
+ <dimen name="ap_preference_item_padding_end">@*android:dimen/car_keyline_1</dimen>
+ <dimen name="ap_preference_item_icon_margin_end">@*android:dimen/car_padding_2</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f514e5b..c6bfc4b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -306,6 +306,20 @@
<string name="wifi_ask_disable"><xliff:g id="requester" example="FancyApp">%s</xliff:g> wants to turn off Wi-Fi</string>
<!-- Summary text when Wi-Fi has error -->
<string name="wifi_error">Error</string>
+ <!-- Title for Network connection request Dialog [CHAR LIMIT=60] -->
+ <string name="network_connection_request_dialog_title">Device to use with <xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g></string>
+ <!-- Message for Network connection timeout Dialog [CHAR LIMIT=NONE] -->
+ <string name="network_connection_timeout_dialog_message">No devices found. Make sure devices are turned on and available to connect.</string>
+ <!-- OK button for Network connection timeout Dialog [CHAR LIMIT=30] -->
+ <string name="network_connection_timeout_dialog_ok">Try again</string>
+ <!-- Message for Network connection error state Dialog [CHAR LIMIT=NONE] -->
+ <string name="network_connection_errorstate_dialog_message">Something came up. The application has cancelled the request to choose a device.</string>
+ <!-- Toast message when connection is successful [CHAR LIMIT=30] -->
+ <string name="network_connection_connect_successful">Connection successful</string>
+ <!-- Neutral button for Network connection request Dialog [CHAR LIMIT=30] -->
+ <string name="network_connection_request_dialog_showall">Show all</string>
+ <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+ <string name="progress_scanning">Searching</string>
<!-- Bluetooth settings --><skip/>
<!-- Title of Bluetooth settings pages. [CHAR LIMIT=30] -->
diff --git a/src/com/android/car/settings/wifi/WifiUtil.java b/src/com/android/car/settings/wifi/WifiUtil.java
index 41f64fd..5e8e40e 100644
--- a/src/com/android/car/settings/wifi/WifiUtil.java
+++ b/src/com/android/car/settings/wifi/WifiUtil.java
@@ -32,6 +32,7 @@
import android.text.TextUtils;
import android.widget.Toast;
+import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import com.android.car.settings.R;
@@ -180,6 +181,31 @@
WifiConfiguration wifiConfig = new WifiConfiguration();
wifiConfig.SSID = String.format("\"%s\"", ssid);
wifiConfig.hiddenSSID = hidden;
+
+ return finishWifiConfig(wifiConfig, security, password);
+ }
+
+ /** Similar to above, but uses AccessPoint to get additional relevant information. */
+ public static WifiConfiguration getWifiConfig(@NonNull AccessPoint accessPoint,
+ String password) {
+ if (accessPoint == null) {
+ throw new IllegalArgumentException("AccessPoint input is required.");
+ }
+
+ WifiConfiguration wifiConfig = new WifiConfiguration();
+ if (!accessPoint.isSaved()) {
+ wifiConfig.SSID = AccessPoint.convertToQuotedString(
+ accessPoint.getSsidStr());
+ } else {
+ wifiConfig.networkId = accessPoint.getConfig().networkId;
+ wifiConfig.hiddenSSID = accessPoint.getConfig().hiddenSSID;
+ }
+
+ return finishWifiConfig(wifiConfig, accessPoint.getSecurity(), password);
+ }
+
+ private static WifiConfiguration finishWifiConfig(WifiConfiguration wifiConfig, int security,
+ String password) {
switch (security) {
case AccessPoint.SECURITY_NONE:
wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
@@ -234,7 +260,6 @@
return wifiConfig;
}
-
/** Forget the network specified by {@code accessPoint}. */
public static void forget(Context context, AccessPoint accessPoint) {
WifiManager wifiManager = context.getSystemService(WifiManager.class);
diff --git a/src/com/android/car/settings/wifi/networkrequest/NetworkRequestDialogActivity.java b/src/com/android/car/settings/wifi/networkrequest/NetworkRequestDialogActivity.java
new file mode 100644
index 0000000..4044d5d
--- /dev/null
+++ b/src/com/android/car/settings/wifi/networkrequest/NetworkRequestDialogActivity.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 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.car.settings.wifi.networkrequest;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+
+/**
+ * When other applications request to have a wifi connection, framework will bring up this activity
+ * to let user select which wifi ap wanna to connect. This activity is just a door for framework
+ * call, and main functional process is at {@code NetworkRequestDialogFragment}.
+ */
+public class NetworkRequestDialogActivity extends FragmentActivity {
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
+ fragment.show(getSupportFragmentManager(),
+ NetworkRequestDialogFragment.class.getSimpleName());
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ finish();
+ }
+}
+
diff --git a/src/com/android/car/settings/wifi/networkrequest/NetworkRequestDialogFragment.java b/src/com/android/car/settings/wifi/networkrequest/NetworkRequestDialogFragment.java
new file mode 100644
index 0000000..2bf595e
--- /dev/null
+++ b/src/com/android/car/settings/wifi/networkrequest/NetworkRequestDialogFragment.java
@@ -0,0 +1,546 @@
+/*
+ * Copyright (C) 2020 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.car.settings.wifi.networkrequest;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerExecutor;
+import android.os.Message;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import com.android.car.settings.R;
+import com.android.car.settings.wifi.WifiUtil;
+import com.android.car.ui.AlertDialogBuilder;
+import com.android.settingslib.Utils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.ObservableDialogFragment;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiTrackerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The Fragment sets up callback {@link NetworkRequestMatchCallback} with framework. To handle most
+ * behaviors of the callback when requesting wifi network, except for error message. When error
+ * happens, {@link NetworkRequestErrorDialogFragment} will be called to display error message.
+ */
+public class NetworkRequestDialogFragment extends ObservableDialogFragment implements
+ DialogInterface.OnClickListener, NetworkRequestMatchCallback {
+
+ /** Message sent to us to stop scanning wifi and pop up timeout dialog. */
+ private static final int MESSAGE_STOP_SCAN_WIFI_LIST = 0;
+
+ /**
+ * Spec defines there should be 5 wifi ap on the list at most or just show all if {@code
+ * mShowLimitedItem} is false.
+ */
+ private static final int MAX_NUMBER_LIST_ITEM = 5;
+ private boolean mShowLimitedItem = true;
+
+ /** Delayed time to stop scanning wifi. */
+ private static final int DELAY_TIME_STOP_SCAN_MS = 30 * 1000;
+
+ static final String EXTRA_APP_NAME = "com.android.settings.wifi.extra.APP_NAME";
+ static final String EXTRA_IS_SPECIFIED_SSID =
+ "com.android.settings.wifi.extra.REQUEST_IS_FOR_SINGLE_NETWORK";
+
+ private List<AccessPoint> mAccessPointList;
+ private FilterWifiTracker mFilterWifiTracker;
+ private AccessPointAdapter mDialogAdapter;
+ private NetworkRequestUserSelectionCallback mUserSelectionCallback;
+ private boolean mIsSpecifiedSsid;
+ private boolean mWaitingConnectCallback;
+
+ /** Creates Network Request dialog. */
+ public static NetworkRequestDialogFragment newInstance() {
+ NetworkRequestDialogFragment dialogFragment = new NetworkRequestDialogFragment();
+ return dialogFragment;
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ Context context = getContext();
+
+ Intent intent = getActivity().getIntent();
+ if (intent != null) {
+ mIsSpecifiedSsid = intent.getBooleanExtra(EXTRA_IS_SPECIFIED_SSID, false);
+ }
+
+ // Prepares adapter.
+ mDialogAdapter = new AccessPointAdapter(context,
+ R.layout.preference_access_point, getAccessPointList());
+
+ AlertDialogBuilder builder = new AlertDialogBuilder(context)
+ .setTitle(getTitle())
+ .setAdapter(mDialogAdapter, /* listener= */ this)
+ .setNegativeButton(R.string.cancel, (dialog, which) -> onCancel(dialog))
+ // Do nothings, will replace the onClickListener to avoid auto closing dialog.
+ .setNeutralButton(R.string.network_connection_request_dialog_showall,
+ /* listener= */ null);
+ if (mIsSpecifiedSsid) {
+ builder.setPositiveButton(R.string.wifi_setup_connect, /* listener= */ null);
+ }
+
+ // Clicking list item is to connect wifi ap.
+ AlertDialog dialog = builder.create();
+ dialog.getListView().setOnItemClickListener(
+ (parent, view, position, id) -> this.onClick(dialog, position));
+
+ // Don't dismiss dialog when touching outside. User reports it is easy to touch outside.
+ // This causes dialog to close.
+ setCancelable(false);
+
+ dialog.setOnShowListener((dialogInterface) -> {
+ // Replace NeutralButton onClickListener to avoid closing dialog
+ Button neutralBtn = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+ neutralBtn.setVisibility(View.GONE);
+ neutralBtn.setOnClickListener(v -> {
+ mShowLimitedItem = false;
+ renewAccessPointList(/* scanResults= */ null);
+ notifyAdapterRefresh();
+ neutralBtn.setVisibility(View.GONE);
+ });
+
+ // Replace Positive onClickListener to avoid closing dialog
+ if (mIsSpecifiedSsid) {
+ Button positiveBtn = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+ positiveBtn.setOnClickListener(v -> {
+ // When clicking connect button, should connect to the first and the only one
+ // list item.
+ this.onClick(dialog, /* position= */ 0);
+ });
+ // Disable button in first, and enable it after there are some accesspoints in list.
+ positiveBtn.setEnabled(false);
+ }
+ });
+ return dialog;
+ }
+
+ private String getTitle() {
+ Intent intent = getActivity().getIntent();
+ String appName = "";
+ if (intent != null) {
+ appName = intent.getStringExtra(EXTRA_APP_NAME);
+ }
+
+ return getString(R.string.network_connection_request_dialog_title, appName);
+ }
+
+ @NonNull
+ List<AccessPoint> getAccessPointList() {
+ // Initials list for adapter, in case of display crashing.
+ if (mAccessPointList == null) {
+ mAccessPointList = new ArrayList<>();
+ }
+ return mAccessPointList;
+ }
+
+ private BaseAdapter getDialogAdapter() {
+ return mDialogAdapter;
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ List<AccessPoint> accessPointList = getAccessPointList();
+ if (accessPointList.size() == 0) {
+ return; // Invalid values.
+ }
+ if (mUserSelectionCallback == null) {
+ return; // Callback is missing or not ready.
+ }
+
+ if (which < accessPointList.size()) {
+ AccessPoint selectedAccessPoint = accessPointList.get(which);
+ WifiConfiguration wifiConfig = selectedAccessPoint.getConfig();
+ if (wifiConfig == null) {
+ if (selectedAccessPoint != null) {
+ wifiConfig = WifiUtil.getWifiConfig(selectedAccessPoint, /* password= */ null);
+ }
+ }
+
+ if (wifiConfig != null) {
+ mUserSelectionCallback.select(wifiConfig);
+
+ mWaitingConnectCallback = true;
+ updateConnectButton(false);
+ }
+ }
+ }
+
+ @Override
+ public void onCancel(@NonNull DialogInterface dialog) {
+ super.onCancel(dialog);
+ // Finishes the activity when user clicks back key or outside of the dialog.
+ if (getActivity() != null) {
+ getActivity().finish();
+ }
+ if (mUserSelectionCallback != null) {
+ mUserSelectionCallback.reject();
+ }
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+
+ mHandler.removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
+ WifiManager wifiManager = getContext().getApplicationContext()
+ .getSystemService(WifiManager.class);
+ if (wifiManager != null) {
+ wifiManager.unregisterNetworkRequestMatchCallback(this);
+ }
+
+ if (mFilterWifiTracker != null) {
+ mFilterWifiTracker.onPause();
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+
+ if (mFilterWifiTracker != null) {
+ mFilterWifiTracker.onDestroy();
+ mFilterWifiTracker = null;
+ }
+ }
+
+ private void showAllButton() {
+ AlertDialog alertDialog = (AlertDialog) getDialog();
+ if (alertDialog == null) {
+ return;
+ }
+
+ Button neutralBtn = alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+ if (neutralBtn != null) {
+ neutralBtn.setVisibility(View.VISIBLE);
+ }
+ }
+
+ private void updateConnectButton(boolean enabled) {
+ // The button is only showed in single SSID mode.
+ if (!mIsSpecifiedSsid) {
+ return;
+ }
+
+ AlertDialog alertDialog = (AlertDialog) getDialog();
+ if (alertDialog == null) {
+ return;
+ }
+
+ Button positiveBtn = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+ if (positiveBtn != null) {
+ positiveBtn.setEnabled(enabled);
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+
+ WifiManager wifiManager = getContext().getApplicationContext()
+ .getSystemService(WifiManager.class);
+ if (wifiManager != null) {
+ wifiManager.registerNetworkRequestMatchCallback(new HandlerExecutor(mHandler), this);
+ }
+ // Sets time-out to stop scanning.
+ mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
+
+ if (mFilterWifiTracker == null) {
+ mFilterWifiTracker = new FilterWifiTracker(getActivity(), getSettingsLifecycle());
+ }
+ mFilterWifiTracker.onResume();
+ }
+
+ private final Handler mHandler = new Handler() {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MESSAGE_STOP_SCAN_WIFI_LIST:
+ removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
+ stopScanningAndPopErrorDialog(
+ NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE.TIME_OUT);
+ break;
+ default:
+ // Do nothing.
+ break;
+ }
+ }
+ };
+
+ protected void stopScanningAndPopErrorDialog(
+ NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE type) {
+ // Dismisses current dialog.
+ Dialog dialog = getDialog();
+ if (dialog != null && dialog.isShowing()) {
+ dismiss();
+ }
+
+ // Throws error dialog.
+ NetworkRequestErrorDialogFragment fragment = NetworkRequestErrorDialogFragment
+ .newInstance();
+ Bundle bundle = new Bundle();
+ bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);
+ fragment.setArguments(bundle);
+ fragment.show(getActivity().getSupportFragmentManager(),
+ NetworkRequestErrorDialogFragment.class.getSimpleName());
+ }
+
+ private class AccessPointAdapter extends ArrayAdapter<AccessPoint> {
+
+ private final int mResourceId;
+ private final LayoutInflater mInflater;
+
+ AccessPointAdapter(Context context, int resourceId, List<AccessPoint> objects) {
+ super(context, resourceId, objects);
+ mResourceId = resourceId;
+ mInflater = LayoutInflater.from(context);
+ }
+
+ @Override
+ public View getView(int position, View view, ViewGroup parent) {
+ if (view == null) {
+ view = mInflater.inflate(mResourceId, parent, false);
+
+ View divider = view.findViewById(
+ com.android.settingslib.R.id.two_target_divider);
+ divider.setVisibility(View.GONE);
+ }
+
+ AccessPoint accessPoint = getItem(position);
+
+ TextView titleView = view.findViewById(android.R.id.title);
+ if (titleView != null) {
+ // Shows whole SSID for better UX.
+ titleView.setSingleLine(false);
+ titleView.setText(accessPoint.getTitle());
+ }
+
+ TextView summary = view.findViewById(android.R.id.summary);
+ if (summary != null) {
+ String summaryString = accessPoint.getSettingsSummary();
+ if (TextUtils.isEmpty(summaryString)) {
+ summary.setVisibility(View.GONE);
+ } else {
+ summary.setVisibility(View.VISIBLE);
+ summary.setText(summaryString);
+ }
+ }
+
+ ImageView imageView = view.findViewById(android.R.id.icon);
+ int level = accessPoint.getLevel();
+ if (imageView != null) {
+ Drawable drawable = getContext().getDrawable(
+ Utils.getWifiIconResource(level));
+ drawable.setTintList(
+ Utils.getColorAttr(getContext(), android.R.attr.colorControlNormal));
+ imageView.setImageDrawable(drawable);
+ }
+
+ return view;
+ }
+ }
+
+ @Override
+ public void onAbort() {
+ stopScanningAndPopErrorDialog(NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE.ABORT);
+ }
+
+ @Override
+ public void onUserSelectionCallbackRegistration(
+ NetworkRequestUserSelectionCallback userSelectionCallback) {
+ mUserSelectionCallback = userSelectionCallback;
+ }
+
+ @Override
+ public void onMatch(List<ScanResult> scanResults) {
+ // Shouldn't need to renew cached list, since input result is empty.
+ if (scanResults != null && scanResults.size() > 0) {
+ mHandler.removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
+ renewAccessPointList(scanResults);
+
+ notifyAdapterRefresh();
+ }
+ }
+
+ // Updates internal AccessPoint list from WifiTracker. scanResults are used to update key list
+ // of AccessPoint, and could be null if there is no necessary to update key list.
+ private void renewAccessPointList(List<ScanResult> scanResults) {
+ if (mFilterWifiTracker == null) {
+ return;
+ }
+
+ // TODO(b/119846365): Checks if we could escalate the converting effort.
+ // Updates keys of scanResults into FilterWifiTracker for updating matched AccessPoints.
+ if (scanResults != null) {
+ mFilterWifiTracker.updateKeys(scanResults);
+ }
+
+ // Re-gets matched AccessPoints from WifiTracker.
+ List<AccessPoint> list = getAccessPointList();
+ list.clear();
+ list.addAll(mFilterWifiTracker.getAccessPoints());
+ }
+
+ @VisibleForTesting
+ void notifyAdapterRefresh() {
+ if (getDialogAdapter() != null) {
+ getDialogAdapter().notifyDataSetChanged();
+ }
+ }
+
+ @Override
+ public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) {
+ Activity activity = getActivity();
+ if (activity != null) {
+ Toast.makeText(activity, R.string.network_connection_connect_successful,
+ Toast.LENGTH_SHORT).show();
+ activity.finish();
+ }
+ }
+
+ @Override
+ public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
+ // Do nothing when selection is failed, let user could try again easily.
+ mWaitingConnectCallback = false;
+ updateConnectButton(true);
+ }
+
+ private final class FilterWifiTracker {
+ private final List<String> mAccessPointKeys;
+ private final WifiTracker mWifiTracker;
+ private final Context mContext;
+
+ FilterWifiTracker(Context context, Lifecycle lifecycle) {
+ mWifiTracker = WifiTrackerFactory.create(context, mWifiListener,
+ lifecycle, /* includeSaved= */ true, /* includeScans= */ true);
+ mAccessPointKeys = new ArrayList<>();
+ mContext = context;
+ }
+
+ /**
+ * Updates key list from input. {@code onMatch()} may be called in multi-times according
+ * wifi scanning result, so needs patchwork here.
+ */
+ public void updateKeys(List<ScanResult> scanResults) {
+ for (ScanResult scanResult : scanResults) {
+ String key = AccessPoint.getKey(mContext, scanResult);
+ if (!mAccessPointKeys.contains(key)) {
+ mAccessPointKeys.add(key);
+ }
+ }
+ }
+
+ /**
+ * Returns only AccessPoints whose key is in {@code mAccessPointKeys}.
+ *
+ * @return List of matched AccessPoints.
+ */
+ public List<AccessPoint> getAccessPoints() {
+ final List<AccessPoint> allAccessPoints = mWifiTracker.getAccessPoints();
+ final List<AccessPoint> result = new ArrayList<>();
+
+ // The order should be kept, because order means wifi score (sorting in WifiTracker).
+ int count = 0;
+ for (AccessPoint accessPoint : allAccessPoints) {
+ String key = accessPoint.getKey();
+ if (mAccessPointKeys.contains(key)) {
+ result.add(accessPoint);
+
+ count++;
+ // Limits how many count of items could show.
+ if (mShowLimitedItem && count >= MAX_NUMBER_LIST_ITEM) {
+ break;
+ }
+ }
+ }
+
+ // Update related UI buttons
+ if (mShowLimitedItem && (count >= MAX_NUMBER_LIST_ITEM)) {
+ showAllButton();
+ }
+ // Enable connect button if there is no pending callback.
+ if (!mWaitingConnectCallback) {
+ updateConnectButton(true);
+ }
+
+ return result;
+ }
+
+ private WifiTracker.WifiListener mWifiListener = new WifiTracker.WifiListener() {
+
+ @Override
+ public void onWifiStateChanged(int state) {
+ notifyAdapterRefresh();
+ }
+
+ @Override
+ public void onConnectedChanged() {
+ notifyAdapterRefresh();
+ }
+
+ @Override
+ public void onAccessPointsChanged() {
+ notifyAdapterRefresh();
+ }
+ };
+
+ public void onDestroy() {
+ if (mWifiTracker != null) {
+ mWifiTracker.onDestroy();
+ }
+ }
+
+ public void onResume() {
+ if (mWifiTracker != null) {
+ mWifiTracker.onStart();
+ }
+ }
+
+ public void onPause() {
+ if (mWifiTracker != null) {
+ mWifiTracker.onStop();
+ }
+ }
+ }
+}
diff --git a/src/com/android/car/settings/wifi/networkrequest/NetworkRequestErrorDialogFragment.java b/src/com/android/car/settings/wifi/networkrequest/NetworkRequestErrorDialogFragment.java
new file mode 100644
index 0000000..7aa1056
--- /dev/null
+++ b/src/com/android/car/settings/wifi/networkrequest/NetworkRequestErrorDialogFragment.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 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.car.settings.wifi.networkrequest;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+import com.android.car.settings.R;
+import com.android.car.ui.AlertDialogBuilder;
+
+/**
+ * The dialog shows an error message when requesting network {@link NetworkRequestDialogFragment}.
+ * Contains multi-error types in {@code ERROR_DIALOG_TYPE}.
+ */
+public class NetworkRequestErrorDialogFragment extends DialogFragment {
+
+ public static final String DIALOG_TYPE = "DIALOG_ERROR_TYPE";
+
+ public enum ERROR_DIALOG_TYPE {TIME_OUT, ABORT}
+
+ /** Creates Network Error dialog. */
+ public static NetworkRequestErrorDialogFragment newInstance() {
+ return new NetworkRequestErrorDialogFragment();
+ }
+
+ @Override
+ public void onCancel(@NonNull DialogInterface dialog) {
+ super.onCancel(dialog);
+ // Wants to finish the activity when user clicks back key or outside of the dialog.
+ getActivity().finish();
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ // Gets error type to construct dialog. Default is TIME_OUT dialog.
+ ERROR_DIALOG_TYPE msgType = ERROR_DIALOG_TYPE.TIME_OUT;
+ if (getArguments() != null) {
+ msgType = (ERROR_DIALOG_TYPE) getArguments().getSerializable(DIALOG_TYPE);
+ }
+
+ AlertDialogBuilder builder = new AlertDialogBuilder(getContext());
+ if (msgType == ERROR_DIALOG_TYPE.TIME_OUT) {
+ builder.setMessage(R.string.network_connection_timeout_dialog_message)
+ .setPositiveButton(R.string.network_connection_timeout_dialog_ok,
+ (dialog, which) -> startScanningDialog())
+ .setNegativeButton(R.string.cancel, (dialog, which) -> getActivity().finish());
+ } else {
+ builder.setMessage(R.string.network_connection_errorstate_dialog_message)
+ .setPositiveButton(R.string.okay, (dialog, which) -> getActivity().finish());
+ }
+ return builder.create();
+ }
+
+ protected void startScanningDialog() {
+ NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
+ fragment.show(getActivity().getSupportFragmentManager(),
+ NetworkRequestDialogFragment.class.getSimpleName());
+ }
+}
