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

Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d am: e3ac2ebb4c

Browse Source 
Change-Id: Id3cdd5772a23470f506a790f1e2cc264f4ee7f1d
This commit is contained in:
TreeHugger Robot
2020-05-07 08:44:32 +00:00
committed by Automerger Merge Worker
parent 4b24985607 e3ac2ebb4c
commit d3db94ab0e
7 changed files with 504 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/p2p/WifiP2pPeer.java
View File

@@ -22,6 +22,7 @@ import android.net.wifi.p2p.WifiP2pDevice;
import android.text.TextUtils;
import android.widget.ImageView;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
@@ -29,19 +30,21 @@ import com.android.settings.R;
public class WifiP2pPeer extends Preference {
private static final int FIXED_RSSI = 60;
private static final int[] STATE_SECURED = {R.attr.state_encrypted};
public WifiP2pDevice device;
private final int mRssi;
@VisibleForTesting final int mRssi;
private ImageView mSignal;
private static final int SIGNAL_LEVELS = 4;
@VisibleForTesting
static final int SIGNAL_LEVELS = 4;
public WifiP2pPeer(Context context, WifiP2pDevice dev) {
super(context);
device = dev;
setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
mRssi = 60; //TODO: fix
mRssi = FIXED_RSSI; //TODO: fix
if (TextUtils.isEmpty(device.deviceName)) {
setTitle(device.deviceAddress);
} else {

3
src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
View File

@@ -52,7 +52,8 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController
};
private final IntentFilter mFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
private final LocationManager mLocationManager;
private final BroadcastReceiver mLocationReceiver = new BroadcastReceiver() {
@VisibleForTesting
final BroadcastReceiver mLocationReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (mWifiDirectPref != null) {

8
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -91,16 +91,16 @@ public class WifiP2pSettings extends DashboardFragment
@VisibleForTesting boolean mLastGroupFormed = false;
private boolean mIsIgnoreInitConnectionInfoCallback = false;
private P2pPeerCategoryPreferenceController mPeerCategoryController;
private P2pPersistentCategoryPreferenceController mPersistentCategoryController;
private P2pThisDevicePreferenceController mThisDevicePreferenceController;
@VisibleForTesting P2pPeerCategoryPreferenceController mPeerCategoryController;
@VisibleForTesting P2pPersistentCategoryPreferenceController mPersistentCategoryController;
@VisibleForTesting P2pThisDevicePreferenceController mThisDevicePreferenceController;
@VisibleForTesting static final int DIALOG_DISCONNECT = 1;
@VisibleForTesting static final int DIALOG_CANCEL_CONNECT = 2;
@VisibleForTesting static final int DIALOG_RENAME = 3;
@VisibleForTesting static final int DIALOG_DELETE_GROUP = 4;
private static final String SAVE_DIALOG_PEER = "PEER_STATE";
@VisibleForTesting static final String SAVE_DIALOG_PEER = "PEER_STATE";
@VisibleForTesting static final String SAVE_DEVICE_NAME = "DEV_NAME";
@VisibleForTesting static final String SAVE_SELECTED_GROUP = "GROUP_NAME";