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

Merge "Rename wifi/NetworkRequestTimeoutDialogFragment to wifi/NetworkRequestErrorDialogFragment for extending usage."

Browse Source
This commit is contained in:
Cosmo Hsieh
2018-12-11 08:21:14 +00:00
committed by Android (Google) Code Review
parent c53717f5d7 38a574173e
commit 5ac2c048fb
7 changed files with 392 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -10252,7 +10252,9 @@
<!-- Message for Network connection timeout Dialog [CHAR LIMIT=NONE] -->
<string name="network_connection_timeout_dialog_message">No devices found. Make sure the device is turned on and available to connect.</string>
<!-- OK button for Network connection timeout Dialog [CHAR LIMIT=30] -->
<string name="network_connection_timeout_dialog_ok">Scan again</string>
<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>
<!-- Summary for bluetooth devices count in Bluetooth devices slice. [CHAR LIMIT=NONE] -->
<plurals name="show_bluetooth_devices">

22
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -44,12 +44,18 @@ import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import com.android.settingslib.Utils;
import com.android.settingslib.wifi.AccessPoint;
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 InstrumentedDialogFragment implements
DialogInterface.OnClickListener, NetworkRequestMatchCallback {
@@ -131,7 +137,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
@Override
public void onCancel(@NonNull DialogInterface dialog) {
super.onCancel(dialog);
// Finishes activity when user clicks back key or outside of dialog.
// Finishes the activity when user clicks back key or outside of the dialog.
getActivity().finish();
}
@@ -166,7 +172,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
switch (msg.what) {
case MESSAGE_STOP_SCAN_WIFI_LIST:
removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
stopScanningAndPopTimeoutDialog();
stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE.TIME_OUT);
break;
default:
// Do nothing.
@@ -175,14 +181,18 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
}
};
protected void stopScanningAndPopTimeoutDialog() {
protected void stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE type) {
// Dismisses current dialog.
dismiss();
// Throws new timeout dialog.
final NetworkRequestTimeoutDialogFragment fragment = NetworkRequestTimeoutDialogFragment
final NetworkRequestErrorDialogFragment fragment = NetworkRequestErrorDialogFragment
.newInstance();
fragment.show(getActivity().getSupportFragmentManager(), null);
final Bundle bundle = new Bundle();
bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);
fragment.setArguments(bundle);
fragment.show(getActivity().getSupportFragmentManager(),
NetworkRequestDialogFragment.class.getSimpleName());
}
@Override
@@ -239,7 +249,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
@Override
public void onAbort() {
// TODO(b/117399926): We should have a UI notify user here.
stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE.ABORT);
}
@Override

86
src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java Normal file
View File

@@ -0,0 +1,86 @@
/*
* Copyright (C) 2018 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.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
/**
* The dialog shows an error message when requesting network {@link NetworkRequestDialogFragment}.
* Contains multi-error types in {@code ERROR_DIALOG_TYPE}.
*/
public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragment {
public static final String DIALOG_TYPE = "DIALOG_ERROR_TYPE";
public enum ERROR_DIALOG_TYPE {TIME_OUT, ABORT}
public static NetworkRequestErrorDialogFragment newInstance() {
return new NetworkRequestErrorDialogFragment();
}
private NetworkRequestErrorDialogFragment() {
super();
}
@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);
}
final AlertDialog.Builder builder = new AlertDialog.Builder(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();
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG;
}
protected void startScanningDialog() {
final NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
fragment.show(getActivity().getSupportFragmentManager(),
NetworkRequestErrorDialogFragment.class.getSimpleName());
}
}

66
src/com/android/settings/wifi/NetworkRequestTimeoutDialogFragment.java
View File

@@ -1,66 +0,0 @@
/*
* Copyright (C) 2018 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.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class NetworkRequestTimeoutDialogFragment extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener {
public static NetworkRequestTimeoutDialogFragment newInstance() {
NetworkRequestTimeoutDialogFragment fragment = new NetworkRequestTimeoutDialogFragment();
return fragment;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext())
.setMessage(R.string.network_connection_timeout_dialog_message)
.setPositiveButton(R.string.network_connection_timeout_dialog_ok, this)
.setNegativeButton(R.string.cancel, null);
return builder.create();
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG;
}
@Override
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
startScanningDialog();
break;
case DialogInterface.BUTTON_NEGATIVE:
default:
// Do nothing.
break;
}
}
protected void startScanningDialog() {
NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
fragment.show(getActivity().getSupportFragmentManager(), null);
}
}

10
tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -32,21 +33,28 @@ import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import com.android.settingslib.wifi.AccessPoint;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.robolectric.shadows.ShadowLooper;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -104,7 +112,7 @@ public class NetworkRequestDialogFragmentTest {
boolean bCalledStopAndPop = false;
@Override
public void stopScanningAndPopTimeoutDialog() {
public void stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE type) {
bCalledStopAndPop = true;
}
}

117
tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java Normal file
View File

@@ -0,0 +1,117 @@
/*
* Copyright (C) 2018 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 static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import android.content.DialogInterface;
import android.os.Bundle;
import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class})
public class NetworkRequestErrorDialogFragmentTest {
private FragmentActivity mActivity;
private NetworkRequestErrorDialogFragment mFragment;
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(FragmentActivity.class);
mFragment = spy(NetworkRequestErrorDialogFragment.newInstance());
mFragment.show(mActivity.getSupportFragmentManager(), null);
}
@Test
public void display_shouldShowTimeoutDialog() {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
assertThat(alertDialog.isShowing()).isTrue();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(RuntimeEnvironment.application
.getString(R.string.network_connection_timeout_dialog_message))
.isEqualTo(shadowAlertDialog.getMessage());
}
@Test
public void display_shouldShowAbortDialog() {
mFragment = spy(NetworkRequestErrorDialogFragment.newInstance());
Bundle bundle = new Bundle();
bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE,
ERROR_DIALOG_TYPE.ABORT);
mFragment.setArguments(bundle);
mFragment.show(mActivity.getSupportFragmentManager(), null);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
assertThat(alertDialog.isShowing()).isTrue();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(RuntimeEnvironment.application
.getString(R.string.network_connection_errorstate_dialog_message))
.isEqualTo(shadowAlertDialog.getMessage());
}
@Test
public void clickPositiveButton_shouldCallStartScanningDialog() {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
Button positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
assertThat(positiveButton).isNotNull();
positiveButton.performClick();
verify(mFragment, times(1)).startScanningDialog();
}
@Test
public void clickNegativeButton_shouldCloseTheDialog() {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
Button negativeButton = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
assertThat(negativeButton).isNotNull();
negativeButton.performClick();
assertThat(alertDialog.isShowing()).isFalse();
}
}

90
tests/robotests/src/com/android/settings/wifi/NetworkRequestTimeoutDialogFragmentTest.java
View File

@@ -1,90 +0,0 @@
/*
* Copyright (C) 2018 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 static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import android.content.DialogInterface;
import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class})
public class NetworkRequestTimeoutDialogFragmentTest {
private FragmentActivity mActivity;
private NetworkRequestTimeoutDialogFragment mFragment;
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(FragmentActivity.class);
mFragment = spy(NetworkRequestTimeoutDialogFragment.newInstance());
mFragment.show(mActivity.getSupportFragmentManager(), null);
}
@Test
public void display_shouldShowTheDialog() {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
assertThat(alertDialog.isShowing()).isTrue();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(RuntimeEnvironment.application
.getString(R.string.network_connection_timeout_dialog_message))
.isEqualTo(shadowAlertDialog.getMessage());
}
@Test
public void clickPositiveButton_shouldCallStartScanningDialog() {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
Button positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
assertThat(positiveButton).isNotNull();
positiveButton.performClick();
verify(mFragment, times(1)).startScanningDialog();
}
@Test
public void clickNegativeButton_shouldCloseTheDialog() {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
Button negativeButton = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
assertThat(negativeButton).isNotNull();
negativeButton.performClick();
assertThat(alertDialog.isShowing()).isFalse();
}
}